geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r634104 - in /geronimo/server/trunk/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/
Date Thu, 06 Mar 2008 01:12:57 GMT
Author: djencks
Date: Wed Mar  5 17:12:57 2008
New Revision: 634104

URL: http://svn.apache.org/viewvc?rev=634104&view=rev
Log:
GERONIMO-3897 Always set the deploymentDescriptor, not just when we've completed the metadata

Modified:
    geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java

Modified: geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java?rev=634104&r1=634103&r2=634104&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java
Wed Mar  5 17:12: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/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java?rev=634104&r1=634103&r2=634104&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
Wed Mar  5 17:12: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



Mime
View raw message