Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PR: MNG-912 

Submitted by: Binyan
Reviewed by:  Brett Porter
avoid "duplicate files" checking during site generation for resources

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@292387 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-09-29 04:18:30 +00:00
parent 5d4c8f0aa9
commit 793b8002cd
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
View File

@ -294,15 +294,21 @@ public class SiteMojo
// Try to find duplicate files // Try to find duplicate files
Map duplicate = new LinkedHashMap(); Map duplicate = new LinkedHashMap();
String defaultExcludes = StringUtils.join( DEFAULT_EXCLUDES, "," );
if ( siteDirectoryFile.exists() ) if ( siteDirectoryFile.exists() )
{ {
tryToFindDuplicates( siteDirectoryFile, duplicate ); // TODO: avoid this hardcoding - the resources dir might be elsewhere. We should really test for duplicate targets, not guess at what source files will be html.
// add the site's 'resources' directory to the default exclude list
String actualExcludes = defaultExcludes + "," + "resources/**";
tryToFindDuplicates( siteDirectoryFile, actualExcludes, duplicate );
} }
// Handle the GeneratedSite Directory // Handle the GeneratedSite Directory
if ( generatedSiteDirectory.exists() ) if ( generatedSiteDirectory.exists() )
{ {
tryToFindDuplicates( generatedSiteDirectory, duplicate ); tryToFindDuplicates( generatedSiteDirectory, defaultExcludes, duplicate );
} }
// Exception if a file is duplicate // Exception if a file is duplicate
@ -1109,13 +1115,13 @@ public class SiteMojo
* <p>The scan is case sensitive.</p> * <p>The scan is case sensitive.</p>
* *
* @param directory the directory to scan * @param directory the directory to scan
* @param defaultExcludes files patterns to be exclude from the search
* @param duplicate the map to update * @param duplicate the map to update
* @throws IOException if any * @throws IOException if any
*/ */
private static void tryToFindDuplicates( File directory, Map duplicate ) private static void tryToFindDuplicates( File directory, String defaultExcludes, Map duplicate )
throws IOException throws IOException
{ {
String defaultExcludes = StringUtils.join( DEFAULT_EXCLUDES, "," );
List siteFiles = FileUtils.getFileNames( directory, null, defaultExcludes, false ); List siteFiles = FileUtils.getFileNames( directory, null, defaultExcludes, false );
for ( Iterator it = siteFiles.iterator(); it.hasNext(); ) for ( Iterator it = siteFiles.iterator(); it.hasNext(); )
{ {