maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hbout...@apache.org
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 GMT
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 @@
 
   <properties>
     <doxiaVersion>1.1.1</doxiaVersion>
-    <doxiaSitetoolsVersion>1.1.1</doxiaSitetoolsVersion>
+    <doxiaSitetoolsVersion>1.1.2-SNAPSHOT</doxiaSitetoolsVersion>
     <mavenVersion>2.0.6</mavenVersion>
   </properties>
 

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
);



Mime
View raw message