Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 61364 invoked from network); 25 Nov 2009 22:27:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 25 Nov 2009 22:27:25 -0000 Received: (qmail 94983 invoked by uid 500); 25 Nov 2009 22:27:24 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 94871 invoked by uid 500); 25 Nov 2009 22:27:24 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 94862 invoked by uid 99); 25 Nov 2009 22:27:24 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Nov 2009 22:27:24 +0000 X-ASF-Spam-Status: No, hits=-2.6 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Nov 2009 22:27:22 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1D937238889D; Wed, 25 Nov 2009 22:27:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r884306 - in /maven/shared/trunk/maven-doxia-tools: pom.xml src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java Date: Wed, 25 Nov 2009 22:27:02 -0000 To: commits@maven.apache.org From: hboutemy@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091125222702.1D937238889D@eris.apache.org> Author: hboutemy Date: Wed Nov 25 22:27:01 2009 New Revision: 884306 URL: http://svn.apache.org/viewvc?rev=884306&view=rev Log: [MSITE-436] initialized lastModified attribute of DecorationModel when reading site.xml with file lastModification() value Modified: maven/shared/trunk/maven-doxia-tools/pom.xml maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java Modified: maven/shared/trunk/maven-doxia-tools/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/pom.xml?rev=884306&r1=884305&r2=884306&view=diff ============================================================================== --- maven/shared/trunk/maven-doxia-tools/pom.xml (original) +++ maven/shared/trunk/maven-doxia-tools/pom.xml Wed Nov 25 22:27:01 2009 @@ -52,7 +52,7 @@ 1.1.1 - 1.1.1 + 1.1.2-SNAPSHOT 2.0.6 Modified: maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java?rev=884306&r1=884305&r2=884306&view=diff ============================================================================== --- maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java (original) +++ maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java Wed Nov 25 22:27:01 2009 @@ -1213,6 +1213,7 @@ } String siteDescriptorContent = null; + long siteDescriptorLastModified = 0L; try { if ( siteDescriptor != null && siteDescriptor.exists() ) @@ -1220,6 +1221,7 @@ getLogger().debug( "Reading site descriptor from " + siteDescriptor ); Reader siteDescriptorReader = ReaderFactory.newXmlReader( siteDescriptor ); siteDescriptorContent = IOUtil.toString( siteDescriptorReader ); + siteDescriptorLastModified = siteDescriptor.lastModified(); } } catch ( IOException e ) @@ -1234,6 +1236,7 @@ inputEncoding, outputEncoding ); decoration = readDecorationModel( siteDescriptorContent ); + decoration.setLastModified( siteDescriptorLastModified ); } MavenProject parentProject = getParentProject( project, reactorProjects, localRepository );