[jboss-cvs] JBossAS SVN: r71163 - in trunk: tomcat/src/resources and 1 other directory.

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

Author: anil.saldhana at jboss.com
Date: 2008-03-21 16:16:34 -0400 (Fri, 21 Mar 2008)
New Revision: 71163

Modified:
   trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java
   trunk/server/src/main/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java
   trunk/tomcat/src/resources/war-deployers-all-beans.xml
   trunk/tomcat/src/resources/war-deployers-beans.xml
Log:
JBAS-5336: merged jbossweb meta data deployer that merges the annotation and xml overrides

Modified: trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java	2008-03-21 20:11:19 UTC (rev 71162)
+++ trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java	2008-03-21 20:16:34 UTC (rev 71163)
@@ -115,7 +115,7 @@
     */
    public AbstractWarDeployer()
    {
-      super(JBossWebMetaData.class);
+      super(JBossWebMetaData.class); 
       setOutput(ServiceMetaData.class);
       setOutput(WarDeployment.class);
    }

Modified: trunk/server/src/main/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java	2008-03-21 20:11:19 UTC (rev 71162)
+++ trunk/server/src/main/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java	2008-03-21 20:16:34 UTC (rev 71163)
@@ -27,6 +27,7 @@
 import org.jboss.deployers.structure.spi.DeploymentUnit;
 import org.jboss.deployment.AnnotationMetaDataDeployer;
 import org.jboss.metadata.ear.jboss.JBossAppMetaData;
+import org.jboss.metadata.web.spec.AnnotationMergedView;
 import org.jboss.metadata.web.jboss.JBossWebMetaData;
 import org.jboss.metadata.web.spec.Web25MetaData;
 import org.jboss.metadata.web.spec.WebMetaData;
@@ -51,7 +52,7 @@
    public MergedJBossWebMetaDataDeployer()
    {
       setStage(DeploymentStages.POST_CLASSLOADER);
-      // ejb-jar.xml metadata
+      // web.xml metadata
       addInput(WebMetaData.class);
       // jboss.xml metadata
       addInput(JBossWebMetaData.class);
@@ -79,7 +80,7 @@
          {
             Web25MetaData specMerged = new Web25MetaData();
             // TODO: JBMETA-7
-            // AnnotationMergedView.merge(specMerged, specMetaData, annotatedMetaData);
+            AnnotationMergedView.merge(specMerged, specMetaData, annotatedMetaData);
             specMetaData = specMerged;
          }
          else

Modified: trunk/tomcat/src/resources/war-deployers-all-beans.xml
===================================================================
--- trunk/tomcat/src/resources/war-deployers-all-beans.xml	2008-03-21 20:11:19 UTC (rev 71162)
+++ trunk/tomcat/src/resources/war-deployers-all-beans.xml	2008-03-21 20:16:34 UTC (rev 71163)
@@ -206,5 +206,10 @@
       -->
       <depends>jboss.jca:service=CachedConnectionManager</depends>
    </bean>
+   
+   <bean name="MergedJBossWebMetaDataDeployer" 
+          class="org.jboss.web.deployers.MergedJBossWebMetaDataDeployer">
+   </bean>
+   
 
 </deployment>

Modified: trunk/tomcat/src/resources/war-deployers-beans.xml
===================================================================
--- trunk/tomcat/src/resources/war-deployers-beans.xml	2008-03-21 20:11:19 UTC (rev 71162)
+++ trunk/tomcat/src/resources/war-deployers-beans.xml	2008-03-21 20:16:34 UTC (rev 71163)
@@ -203,5 +203,9 @@
       <depends>jboss:service=TransactionManager</depends>
       <depends>jboss.jca:service=CachedConnectionManager</depends>
    </bean>
+   
+   <bean name="MergedJBossWebMetaDataDeployer" 
+          class="org.jboss.web.deployers.MergedJBossWebMetaDataDeployer">
+   </bean>
 
 </deployment>