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

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

Author: wolfc
Date: 2006-11-28 09:25:38 -0500 (Tue, 28 Nov 2006)
New Revision: 58702

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java
   trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBStage2Deployer.java
   trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java
Log:
EJBTHREE-718: client deployer after stage2

Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java	2006-11-28 13:43:29 UTC (rev 58701)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java	2006-11-28 14:25:38 UTC (rev 58702)
@@ -54,6 +54,13 @@
    private Properties defaultPersistenceProperties;
    private List<String> allowedSuffixes;
 
+   public EJBRegistrationDeployer()
+   {
+      // make sure we run before the stage 2 deployer
+      // TODO: what's is the proper relative order?
+      setRelativeOrder(COMPONENT_DEPLOYER - 1);
+   }
+   
    public List<String> getAllowedSuffixes()
    {
       return allowedSuffixes;

Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBStage2Deployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBStage2Deployer.java	2006-11-28 13:43:29 UTC (rev 58701)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBStage2Deployer.java	2006-11-28 14:25:38 UTC (rev 58702)
@@ -38,6 +38,12 @@
 {
    private static final Logger log = Logger.getLogger(EJBStage2Deployer.class);
 
+   public EJBStage2Deployer()
+   {
+      // make sure we run at right moment (before EJB3 client deployer)
+      setRelativeOrder(COMPONENT_DEPLOYER);
+   }
+   
    public void deploy(DeploymentUnit unit) throws DeploymentException
    {
       Ejb3Deployment deployment = unit.getAttachment(Ejb3Deployment.class);

Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java	2006-11-28 13:43:29 UTC (rev 58701)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java	2006-11-28 14:25:38 UTC (rev 58702)
@@ -60,6 +60,8 @@
    public Ejb3ClientDeployer()
    {
       super(ApplicationClientDD.class);
+      // make sure we run after EJB3 deployer
+      setRelativeOrder(COMPONENT_DEPLOYER + 1);
    }
    
    @Override