You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2008/03/06 15:36:42 UTC
svn commit: r634278 -
/geronimo/server/branches/2.0/modules/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
Author: dwoods
Date: Thu Mar 6 06:36:41 2008
New Revision: 634278
URL: http://svn.apache.org/viewvc?rev=634278&view=rev
Log:
GERONIMO-3897 Always set the deploymentDescriptor, not just when we've completed the metadata
Modified:
geronimo/server/branches/2.0/modules/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
Modified: geronimo/server/branches/2.0/modules/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java?rev=634278&r1=634277&r2=634278&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java (original)
+++ geronimo/server/branches/2.0/modules/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java Thu Mar 6 06:36:41 2008
@@ -452,8 +452,8 @@
if (!webApp.getMetadataComplete()) {
webApp.setMetadataComplete(true);
module.setOriginalSpecDD(module.getSpecDD().toString());
- webModuleData.setAttribute("deploymentDescriptor", module.getOriginalSpecDD());
}
+ webModuleData.setAttribute("deploymentDescriptor", module.getOriginalSpecDD());
/**
* This next bit of code is kind of a kludge to get Tomcat to get a default
* web.xml if one does not exist. This is primarily for jaxws. This code is