[jboss-cvs] JBossAS SVN: r101086 - projects/aop/trunk/deployers/src/main/java/org/jboss/aop/asintegration/jboss5.

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

Author: kabir.khan at jboss.com
Date: 2010-02-17 12:11:51 -0500 (Wed, 17 Feb 2010)
New Revision: 101086

Modified:
   projects/aop/trunk/deployers/src/main/java/org/jboss/aop/asintegration/jboss5/AOPAnnotationMetaDataParserDeployer.java
Log:
[JBAOP-768] Merge to trunk, Move to POST_PARSE stage

Modified: projects/aop/trunk/deployers/src/main/java/org/jboss/aop/asintegration/jboss5/AOPAnnotationMetaDataParserDeployer.java
===================================================================
--- projects/aop/trunk/deployers/src/main/java/org/jboss/aop/asintegration/jboss5/AOPAnnotationMetaDataParserDeployer.java	2010-02-17 17:09:40 UTC (rev 101085)
+++ projects/aop/trunk/deployers/src/main/java/org/jboss/aop/asintegration/jboss5/AOPAnnotationMetaDataParserDeployer.java	2010-02-17 17:11:51 UTC (rev 101086)
@@ -59,10 +59,18 @@
    public AOPAnnotationMetaDataParserDeployer(int xmlParserOrder)
    {
       super.setOutput(AOPDeployment.class);
-      super.setStage(DeploymentStages.PARSE);
-      //Make this come after the AOPXMLMetaDataParserDeployer
-      super.setRelativeOrder(xmlParserOrder + 1);
+      super.setStage(DeploymentStages.POST_PARSE);
+      if (xmlParserOrder != 0)
+      {
+         //Make this come after the AOPXMLMetaDataParserDeployer if the relative order is set
+         super.setRelativeOrder(xmlParserOrder + 1);
+      }
    }
+   
+   public AOPAnnotationMetaDataParserDeployer()
+   {
+      this(0);
+   }
 
    public void deploy(DeploymentUnit unit) throws DeploymentException
    {