[jboss-cvs] JBossAS SVN: r82666 - projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata.

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

Author: alesj
Date: 2009-01-07 12:18:25 -0500 (Wed, 07 Jan 2009)
New Revision: 82666

Modified:
   projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostWebMetadataDeployer.java
   projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WBEjbInterceptorMetadataDeployer.java
Log:
Use annotation/scanned view in ejb interceptor / servlet listener addition.

Modified: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostWebMetadataDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostWebMetadataDeployer.java	2009-01-07 16:30:40 UTC (rev 82665)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostWebMetadataDeployer.java	2009-01-07 17:18:25 UTC (rev 82666)
@@ -25,6 +25,7 @@
 import java.util.List;
 
 import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.deployer.DeploymentStages;
 import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
 import org.jboss.metadata.web.jboss.JBossWebMetaData;
 import org.jboss.metadata.web.spec.ListenerMetaData;
@@ -44,6 +45,8 @@
    {
       super(JBossWebMetaData.class);
       addInput(JBossWebBeansMetaData.WEB_BEANS_FILES);
+      addInput("merged." + JBossWebMetaData.class.getName());
+      setStage(DeploymentStages.POST_CLASSLOADER);
       setOptionalWebBeansXml(true);
       // create wbl listener
       WBL = new ListenerMetaData();

Modified: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WBEjbInterceptorMetadataDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WBEjbInterceptorMetadataDeployer.java	2009-01-07 16:30:40 UTC (rev 82665)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WBEjbInterceptorMetadataDeployer.java	2009-01-07 17:18:25 UTC (rev 82666)
@@ -46,11 +46,11 @@
    public WBEjbInterceptorMetadataDeployer()
    {
       addInput(EjbJarMetaData.class);
-      addOutput(EjbJarMetaData.class);
       addInput(JBossMetaData.class);
       addOutput(JBossMetaData.class);
       addInput(JBossWebBeansMetaData.WEB_BEANS_FILES);
-      setStage(DeploymentStages.POST_PARSE);
+      addInput("merged." + JBossMetaData.class.getName()); 
+      setStage(DeploymentStages.POST_CLASSLOADER);
       // create interceptor metadata instance
       SBI = new InterceptorMetaData();
       SBI.setInterceptorClass("org.jboss.webbeans.ejb.SessionBeanInterceptor");