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

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

Author: jaikiran
Date: 2009-06-09 09:30:40 -0400 (Tue, 09 Jun 2009)
New Revision: 89989

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java
Log:
JBAS-7004 Fixed the usage of a MC API which was resulting in picking irrelevant deployments

Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java	2009-06-09 13:22:44 UTC (rev 89988)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java	2009-06-09 13:30:40 UTC (rev 89989)
@@ -29,7 +29,7 @@
 import org.jboss.beans.metadata.api.annotations.Start;
 import org.jboss.beans.metadata.api.annotations.Stop;
 import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.vfs.spi.deployer.AbstractVFSRealDeployer;
+import org.jboss.deployers.vfs.spi.deployer.AbstractSimpleVFSRealDeployer;
 import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
 import org.jboss.deployment.security.JaccPolicyUtil;
 import org.jboss.deployment.spi.DeploymentEndpointResolver;
@@ -57,8 +57,7 @@
  * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
  * @version $Revision$
  */
-public class Ejb3Deployer //extends AbstractSimpleVFSRealDeployer<JBossMetaData>
-   extends AbstractVFSRealDeployer
+public class Ejb3Deployer extends AbstractSimpleVFSRealDeployer<JBossMetaData>
 {
    private Set<String> allowedSuffixes;
    
@@ -85,6 +84,11 @@
    
    public Ejb3Deployer()
    {
+	   // let the super deployer do the necessary stuff
+	   // to add JBossMetaData as a requirement
+	   super(JBossMetaData.class);
+	   // we also want this merged metadata for processing.
+	   // Using addInput ensures ordering http://www.jboss.org/index.html?module=bb&op=viewtopic&t=156725
       addInput(MergedJBossMetaDataDeployer.EJB_MERGED_ATTACHMENT_NAME);
       // TODO: should we really output this
       setOutput(Ejb3Deployment.class);
@@ -92,12 +96,8 @@
       setOutput(KernelDeployment.class);
    }
 
+   
    @Override
-   public void deploy(VFSDeploymentUnit unit) throws DeploymentException
-   {
-      deploy(unit, unit.getAttachment(JBossMetaData.class));
-   }
-   
    public void deploy(VFSDeploymentUnit unit, JBossMetaData metaData) throws DeploymentException
    {
       try
@@ -298,7 +298,7 @@
    }
    
    @Override
-   public void undeploy(VFSDeploymentUnit unit)
+   public void undeploy(VFSDeploymentUnit unit, JBossMetaData metadata)
    {
       Ejb3Deployment deployment = unit.getAttachment(Ejb3Deployment.class);
       if(deployment == null)