Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 19376 invoked from network); 6 Mar 2008 01:13:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 6 Mar 2008 01:13:21 -0000 Received: (qmail 14991 invoked by uid 500); 6 Mar 2008 01:13:17 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 14946 invoked by uid 500); 6 Mar 2008 01:13:17 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 14937 invoked by uid 99); 6 Mar 2008 01:13:17 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Mar 2008 17:13:17 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Mar 2008 01:12:38 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 80CB71A983A; Wed, 5 Mar 2008 17:12:58 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080306011258.80CB71A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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