svn commit: r1721044 - /maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java

[hboutemy]

Author: hboutemy
Date: Sun Dec 20 17:16:58 2015
New Revision: 1721044

URL: http://svn.apache.org/viewvc?rev=1721044&view=rev
Log:
[DOXIASITETOOLS-132] do not override existing content with template when 
copyResources()

Modified:
    
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java

Modified: 
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java?rev=1721044&r1=1721043&r2=1721044&view=diff
==============================================================================
--- 
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
 (original)
+++ 
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
 Sun Dec 20 17:16:58 2015
@@ -741,6 +741,13 @@ public class DefaultSiteRenderer
                         File destFile = new File( outputDirectory, 
entry.getName() );
                         if ( !entry.isDirectory() )
                         {
+                            if ( destFile.exists() )
+                            {
+                                // don't override existing content: avoids 
extra rewrite with same content or extra site
+                                // resource
+                                continue;
+                            }
+
                             destFile.getParentFile().mkdirs();
 
                             copyFileFromZip( file, entry, destFile );
@@ -790,6 +797,13 @@ public class DefaultSiteRenderer
 
                         File outputFile = new File( outputDirectory, line );
 
+                        if ( outputFile.exists() )
+                        {
+                            // don't override existing content: avoids extra 
rewrite with same content or extra site
+                            // resource
+                            continue;
+                        }
+
                         if ( !outputFile.getParentFile().exists() )
                         {
                             outputFile.getParentFile().mkdirs();