[jboss-cvs] JBossAS SVN: r58330 - trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers

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

Author: scott.stark at jboss.org
Date: 2006-11-13 23:07:22 -0500 (Mon, 13 Nov 2006)
New Revision: 58330

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/TomcatDeployment.java
Log:
Add support for an alt-dd specification of an alternate web.xml descriptor.

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/TomcatDeployment.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/TomcatDeployment.java	2006-11-14 04:07:00 UTC (rev 58329)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/TomcatDeployment.java	2006-11-14 04:07:22 UTC (rev 58330)
@@ -200,6 +200,13 @@
             "context.xml"));
       server.setAttribute(objectName, new Attribute("defaultWebXml",
             "conf/web.xml"));
+      // If there is an alt-dd set it
+      if( metaData.getAltDDPath() != null )
+      {
+         String altPath = metaData.getAltDDPath();
+         log.debug("Setting altDDName to: "+altPath);
+         server.setAttribute(objectName, new Attribute("altDDName", altPath));
+      }
 
       server.setAttribute(objectName, new Attribute("javaVMs", javaVMs));