Author: vsiveton
Date: Mon Oct 31 15:10:58 2005
New Revision: 329928
URL: http://svn.apache.org/viewcvs?rev=329928&view=rev
Log:
PR: MNG-1382("duplicate files" exception)
Update defaultExcludes depending locales and defaultLocale
Modified:
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
Modified:
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java?rev=329928&r1=329927&r2=329928&view=diff
==============================================================================
---
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
(original)
+++
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
Mon Oct 31 15:10:58 2005
@@ -291,6 +291,14 @@
// Try to find duplicate files
Map duplicate = new LinkedHashMap();
String defaultExcludes = StringUtils.join(
FileUtils.getDefaultExcludes(), "," );
+ if ( locale.getLanguage().equals( defaultLocale.getLanguage()
) )
+ {
+ for (Iterator it = localesList.iterator(); it.hasNext();)
+ {
+ Locale l = (Locale) it.next();
+ defaultExcludes += "," + l.getLanguage() + "/**";
+ }
+ }
if ( siteDirectoryFile.exists() )
{
