[jboss-cvs] JBossAS SVN: r108141 - trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata.

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

Author: marius.bogoevici
Date: 2010-09-14 15:43:39 -0400 (Tue, 14 Sep 2010)
New Revision: 108141

Modified:
   trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/PostWebMetadataDeployer.java
Log:
JBAS-8395 - run web metadata deployer after metadata merge

Modified: trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/PostWebMetadataDeployer.java
===================================================================
--- trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/PostWebMetadataDeployer.java	2010-09-14 14:51:08 UTC (rev 108140)
+++ trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/PostWebMetadataDeployer.java	2010-09-14 19:43:39 UTC (rev 108141)
@@ -34,8 +34,8 @@
 import org.jboss.metadata.web.spec.FilterMetaData;
 import org.jboss.metadata.web.spec.FiltersMetaData;
 import org.jboss.metadata.web.spec.ListenerMetaData;
+import org.jboss.metadata.web.spec.WebMetaData;
 import org.jboss.vfs.VirtualFile;
-import org.jboss.weld.integration.deployer.DeployersUtils;
 
 /**
  * Post web.xml weld deployer.
@@ -53,6 +53,10 @@
    {
       super(JBossWebMetaData.class, true);
       addInput("merged." + JBossWebMetaData.class.getName());
+      addInput("order."+ WebMetaData.class.getName());
+      addInput("overlays."+WebMetaData.class.getName());
+      addInput("localscis."+WebMetaData.class.getName());
+      
       setStage(DeploymentStages.POST_CLASSLOADER);
       setOptionalWeldXml(true);
       // create wbl listener
@@ -66,6 +70,7 @@
       CPFM = new FilterMappingMetaData();
       CPFM.setFilterName("Weld Conversation Propagation Filter");
       CPFM.setUrlPatterns(Arrays.asList("/*"));
+      addOutput("merged." + JBossWebMetaData.class.getName());
    }
 
    protected void internalDeploy(VFSDeploymentUnit unit, JBossWebMetaData deployment, Collection<VirtualFile> wbXml) throws DeploymentException