[jboss-cvs] JBossAS SVN: r57429 - in trunk/server/src/main/org/jboss: deployment metadata/web

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

Author: scott.stark at jboss.org
Date: 2006-10-04 13:25:45 -0400 (Wed, 04 Oct 2006)
New Revision: 57429

Modified:
   trunk/server/src/main/org/jboss/deployment/JBossWebAppParsingDeployer.java
   trunk/server/src/main/org/jboss/deployment/WebAppParsingDeployer.java
   trunk/server/src/main/org/jboss/metadata/web/JBossWebMetaDataObjectFactory.java
Log:
Update for AbstractParsingDeployer changes to propagate an existing deployment type to the parse phase.

Modified: trunk/server/src/main/org/jboss/deployment/JBossWebAppParsingDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/JBossWebAppParsingDeployer.java	2006-10-04 17:25:41 UTC (rev 57428)
+++ trunk/server/src/main/org/jboss/deployment/JBossWebAppParsingDeployer.java	2006-10-04 17:25:45 UTC (rev 57429)
@@ -39,7 +39,6 @@
 public class JBossWebAppParsingDeployer extends ObjectModelFactoryDeployer<WebMetaData>
 {
    private String webXmlPath = "jboss-web.xml";
-   private WebMetaData metaData;
 
    public JBossWebAppParsingDeployer()
    {
@@ -55,6 +54,12 @@
       this.webXmlPath = webXmlPath;
    }
 
+   @Override
+   protected boolean allowsReparse()
+   {
+      return true;
+   }
+
    /**
     * Overriden to order this deployer after the WebAppParsingDeployer
     */
@@ -69,7 +74,6 @@
       throws Exception
    {
       log.debug("init, metaData: "+metaData);
-      this.metaData = metaData;
       super.init(unit, metaData, file);
    }
 
@@ -77,10 +81,10 @@
     * @return JBossWebMetaDataObjectFactory
     */
    @Override
-   protected ObjectModelFactory getObjectModelFactory()
+   protected ObjectModelFactory getObjectModelFactory(WebMetaData root)
    {
       log.debug("getObjectModelFactory");
-      return new JBossWebMetaDataObjectFactory(metaData);
+      return new JBossWebMetaDataObjectFactory(root);
    }
 
    /**
@@ -90,9 +94,6 @@
    public void deploy(DeploymentUnit unit) throws DeploymentException
    {
       log.debug("deploy, unit: "+unit);
-      String key = getDeploymentType().getName();
-      // Retrieve any existing WebMetaData
-      metaData = unit.getTransientManagedObjects().getAttachment(key, getDeploymentType());
       createMetaData(unit, webXmlPath, null);
    }
 

Modified: trunk/server/src/main/org/jboss/deployment/WebAppParsingDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/WebAppParsingDeployer.java	2006-10-04 17:25:41 UTC (rev 57428)
+++ trunk/server/src/main/org/jboss/deployment/WebAppParsingDeployer.java	2006-10-04 17:25:45 UTC (rev 57429)
@@ -62,7 +62,7 @@
    }
 
    @Override
-   protected ObjectModelFactory getObjectModelFactory()
+   protected ObjectModelFactory getObjectModelFactory(WebMetaData root)
    {
       return new WebMetaDataObjectFactory();
    }

Modified: trunk/server/src/main/org/jboss/metadata/web/JBossWebMetaDataObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/web/JBossWebMetaDataObjectFactory.java	2006-10-04 17:25:41 UTC (rev 57428)
+++ trunk/server/src/main/org/jboss/metadata/web/JBossWebMetaDataObjectFactory.java	2006-10-04 17:25:45 UTC (rev 57429)
@@ -209,6 +209,10 @@
       {
          dd.addDependency(value);
       }
+      else if (localName.equals("context-root"))
+      {
+         dd.setContextRoot(value);
+      }
       else if (localName.equals("security-domain"))
       {
          dd.setSecurityDomain(value);