[jboss-cvs] JBossAS SVN: r58028 - trunk/server/src/main/org/jboss/web/deployers

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

Author: thomas.diesler at jboss.com
Date: 2006-11-02 16:54:18 -0500 (Thu, 02 Nov 2006)
New Revision: 58028

Modified:
   trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java
Log:
// FIXME: JBAS-3812 - TomcatDeployment should use modified WebMetaData
URL warURL = (URL) di.getAttachment("jbossws.expanded.war.url");


Modified: trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java
===================================================================
--- trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java	2006-11-02 21:46:33 UTC (rev 58027)
+++ trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java	2006-11-02 21:54:18 UTC (rev 58028)
@@ -310,11 +310,16 @@
          String webContext = metaData.getContextRoot();
    
          // Get the war URL
-         URL warURL = di.getDeploymentContext().getRoot().toURL();
+         // FIXME: JBAS-3812 - TomcatDeployment should use modified WebMetaData
+         URL warURL = (URL) di.getAttachment("jbossws.expanded.war.url");
+         if (warURL == null)
+        	 warURL = di.getDeploymentContext().getRoot().toURL();
+         
          // Strip any jar: url syntax. This should be be exposed by the vfs
          String warURLString = warURL.toString();
          if( warURLString.startsWith("jar:") )
             warURLString = warURLString.substring(4, warURLString.length()-2);
+         
          log.debug("webContext: " + webContext);
          log.debug("warURL: " + warURLString);