You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/03/06 09:10:58 UTC
svn commit: r634186 - in /geronimo/server/branches/2.1/plugins:
jetty/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/
tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/
Author: djencks
Date: Thu Mar 6 00:10:57 2008
New Revision: 634186
URL: http://svn.apache.org/viewvc?rev=634186&view=rev
Log:
GERONIMO-3897 Always set the deploymentDescriptor, not just when we've completed the metadata
Modified:
geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java
geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
Modified: geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java?rev=634186&r1=634185&r2=634186&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java (original)
+++ geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java Thu Mar 6 00:10:57 2008
@@ -522,8 +522,8 @@
if (!webApp.getMetadataComplete()) {
webApp.setMetadataComplete(true);
module.setOriginalSpecDD(module.getSpecDD().toString());
- webModuleData.setAttribute("deploymentDescriptor", module.getOriginalSpecDD());
}
+ webModuleData.setAttribute("deploymentDescriptor", module.getOriginalSpecDD());
if (!module.isStandAlone()) {
ConfigurationData moduleConfigurationData = moduleContext.getConfigurationData();
Modified: geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java?rev=634186&r1=634185&r2=634186&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java (original)
+++ geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java Thu Mar 6 00:10:57 2008
@@ -496,8 +496,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