[jboss-cvs] JBossAS SVN: r96061 - in trunk/server/src/main/java/org/jboss: web/deployers and 1 other directory.

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

Author: remy.maucherat at jboss.com
Date: 2009-11-05 12:20:36 -0500 (Thu, 05 Nov 2009)
New Revision: 96061

Modified:
   trunk/server/src/main/java/org/jboss/deployment/JBossWebAppParsingDeployer.java
   trunk/server/src/main/java/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java
Log:
- Drop early merging of web.xml into jboss-web.xml.

Modified: trunk/server/src/main/java/org/jboss/deployment/JBossWebAppParsingDeployer.java
===================================================================
--- trunk/server/src/main/java/org/jboss/deployment/JBossWebAppParsingDeployer.java	2009-11-05 16:45:22 UTC (rev 96060)
+++ trunk/server/src/main/java/org/jboss/deployment/JBossWebAppParsingDeployer.java	2009-11-05 17:20:36 UTC (rev 96061)
@@ -73,27 +73,15 @@
    protected void createMetaData(DeploymentUnit unit, String name, String suffix) throws DeploymentException
    {
       super.createMetaData(unit, name, suffix);
-      // Merge the spec metadata
-      WebMetaData specMetaData = unit.getAttachment(WebMetaData.class);
-      JBossWebMetaData metaData = unit.getAttachment(JBossWebMetaData.class);
-      if(specMetaData == null && metaData == null)
-         return;
 
+      JBossWebMetaData metaData = unit.getAttachment(JBossWebMetaData.class);
       // If there no JBossWebMetaData was created from a jboss-web.xml, create one
       if (metaData == null)
       {
          metaData = new JBossWebMetaData();
       }
-      // Create a merged view
-      JBossWebMetaData mergedMetaData = new JBossWebMetaData();
-      mergedMetaData.merge(metaData, specMetaData);
-      // Set the merged as the output
-      unit.getTransientManagedObjects().addAttachment(JBossWebMetaData.class, mergedMetaData);
-      // Keep the raw parsed metadata as well
-      if (unit.getAttachment("Raw"+JBossWebMetaData.class.getName()) == null)
-      {
-         unit.addAttachment("Raw"+JBossWebMetaData.class.getName(), metaData, JBossWebMetaData.class);
-      }
+      unit.getTransientManagedObjects().addAttachment(JBossWebMetaData.class, metaData);
+      unit.addAttachment("Raw"+JBossWebMetaData.class.getName(), metaData, JBossWebMetaData.class);
    }
 
    /**
@@ -106,10 +94,6 @@
       super.createMetaData(unit, name, suffix, key);
       
       JBossWebMetaData result = unit.getTransientManagedObjects().getAttachment(getOutput());
-      if (result != null && unit.getAttachment("Raw"+JBossWebMetaData.class.getName()) == null)
-      {
-         unit.addAttachment("Raw"+JBossWebMetaData.class.getName(), result, JBossWebMetaData.class);
-      }
       if (result == null)
       {
          result = new JBossWebMetaData();

Modified: trunk/server/src/main/java/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java
===================================================================
--- trunk/server/src/main/java/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java	2009-11-05 16:45:22 UTC (rev 96060)
+++ trunk/server/src/main/java/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java	2009-11-05 17:20:36 UTC (rev 96061)
@@ -98,7 +98,7 @@
    public void deploy(DeploymentUnit unit) throws DeploymentException
    {
       WebMetaData specMetaData = unit.getAttachment(WebMetaData.class);
-      JBossWebMetaData metaData = (JBossWebMetaData) unit.getAttachment("Raw"+JBossWebMetaData.class.getName());
+      JBossWebMetaData metaData = unit.getAttachment(JBossWebMetaData.class);
       if(specMetaData == null && metaData == null)
          return;