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

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

Author: scott.stark at jboss.org
Date: 2008-04-29 21:35:19 -0400 (Tue, 29 Apr 2008)
New Revision: 72883

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java
   trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java
   trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java
Log:
JBCTS-771, Declare the output of KernelDeployment attachments from the JBossASKernel install to ensure the ejb3 deployers come before the KernelDeploymentDeployer

Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java	2008-04-30 00:51:58 UTC (rev 72882)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java	2008-04-30 01:35:19 UTC (rev 72883)
@@ -115,8 +115,6 @@
     */
    public EJBRegistrationDeployer()
    {
-      // TODO: Temporary JBMICROCONT-190 workaround for deployer order
-      setRelativeOrder(-1);
       setOutputs(Ejb3Deployment.class.getName(), JaccPolicyUtil.IGNORE_ME_NAME);
    }
    

Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java	2008-04-30 00:51:58 UTC (rev 72882)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java	2008-04-30 01:35:19 UTC (rev 72883)
@@ -42,6 +42,7 @@
 import org.jboss.ejb3.clientmodule.ClientENCInjectionContainer;
 import org.jboss.iiop.CorbaORBService;
 import org.jboss.kernel.Kernel;
+import org.jboss.kernel.spi.deployment.KernelDeployment;
 import org.jboss.metadata.client.jboss.JBossClientMetaData;
 import org.jboss.naming.Util;
 import org.jboss.virtual.VFSUtils;
@@ -68,6 +69,8 @@
    {
       super(JBossClientMetaData.class);
       setOutput(ClientENCInjectionContainer.class);
+      // JBossASKernel install output
+      setOutput(KernelDeployment.class);
    }
 
    public boolean isLinkDeploymentJndiName()

Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java	2008-04-30 00:51:58 UTC (rev 72882)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java	2008-04-30 01:35:19 UTC (rev 72883)
@@ -40,6 +40,7 @@
 import org.jboss.ejb3.pool.PoolFactoryRegistry;
 import org.jboss.ejb3.proxy.factory.RemoteProxyFactoryRegistry;
 import org.jboss.kernel.Kernel;
+import org.jboss.kernel.spi.deployment.KernelDeployment;
 import org.jboss.metadata.ear.jboss.JBossAppMetaData;
 import org.jboss.metadata.ejb.jboss.JBossMetaData;
 import org.jboss.metadata.web.jboss.JBossWebMetaData;
@@ -84,6 +85,8 @@
       addInput(PersistenceUnitsMetaData.class);
       // TODO: should we really output this
       setOutput(Ejb3Deployment.class);
+      // JBossASKernel install output
+      setOutput(KernelDeployment.class);
    }
 
    @Override