[jboss-cvs] JBossAS SVN: r95912 - branches/JBPAPP_5_0/ejb3/src/main/org/jboss/ejb3/deployers.

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

Author: jaikiran
Date: 2009-11-02 06:03:54 -0500 (Mon, 02 Nov 2009)
New Revision: 95912

Modified:
   branches/JBPAPP_5_0/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java
Log:
JBPAPP-2934 Porting the fix in EJB3Deployer from Branch_5_x

Modified: branches/JBPAPP_5_0/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java
===================================================================
--- branches/JBPAPP_5_0/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java	2009-11-02 11:00:59 UTC (rev 95911)
+++ branches/JBPAPP_5_0/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java	2009-11-02 11:03:54 UTC (rev 95912)
@@ -21,7 +21,6 @@
  */
 package org.jboss.ejb3.deployers;
 
-import java.util.Properties;
 import java.util.Set;
 
 import javax.management.MBeanServer;
@@ -30,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;
@@ -39,6 +38,7 @@
 import org.jboss.ejb3.Ejb3Deployment;
 import org.jboss.ejb3.cache.CacheFactoryRegistry;
 import org.jboss.ejb3.cache.persistence.PersistenceManagerFactoryRegistry;
+import org.jboss.ejb3.common.deployers.spi.AttachmentNames;
 import org.jboss.ejb3.common.registrar.plugin.mc.Ejb3McRegistrar;
 import org.jboss.ejb3.common.registrar.spi.Ejb3Registrar;
 import org.jboss.ejb3.common.registrar.spi.Ejb3RegistrarLocator;
@@ -58,8 +58,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;
    
@@ -86,19 +85,20 @@
    
    public Ejb3Deployer()
    {
-      addInput(MergedJBossMetaDataDeployer.EJB_MERGED_ATTACHMENT_NAME);
+	   // let the super deployer do the necessary stuff
+	   // to add JBossMetaData as a requirement
+	   super(JBossMetaData.class);
+	   // we also want post processed metadata for processing.
+	   // Using addInput ensures ordering http://www.jboss.org/index.html?module=bb&op=viewtopic&t=156725
+      addInput(AttachmentNames.PROCESSED_METADATA);
       // TODO: should we really output this
       setOutput(Ejb3Deployment.class);
       // JBossASKernel install output
       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
@@ -299,7 +299,7 @@
    }
    
    @Override
-   public void undeploy(VFSDeploymentUnit unit)
+   public void undeploy(VFSDeploymentUnit unit, JBossMetaData metadata)
    {
       Ejb3Deployment deployment = unit.getAttachment(Ejb3Deployment.class);
       if(deployment == null)