svn commit: r480231 - /maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java

[jv...@apache.org]

Author: jvanzyl
Date: Tue Nov 28 13:58:52 2006
New Revision: 480231

URL: http://svn.apache.org/viewvc?view=rev&rev=480231
Log:
o don't overwrite resources if they have been provided by the project itself. most folks will be providing their
  own NOTICE.txt file for example


Modified:
    maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java

Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java?view=diff&rev=480231&r1=480230&r2=480231
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java Tue Nov 28 13:58:52 2006
@@ -137,6 +137,8 @@
 
         RemoteResourcesClassLoader classLoader = new RemoteResourcesClassLoader();
 
+        File standardResourcesDirectory = new File( project.getBasedir(), "src/main/resources" );
+
         for ( Iterator i = resourceBundles.iterator(); i.hasNext(); )
         {
             String artifactDescriptor = (String) i.next();
@@ -212,15 +214,26 @@
 
             for ( Iterator i = bundle.getRemoteResources().iterator(); i.hasNext(); )
             {
-                String resource = (String) i.next();
+                String bundleResource = (String) i.next();
+
+                String projectResource = StringUtils.replaceOnce( bundleResource, ".vm", ".txt" );
+
+                // Don't overwrite resource that are already being provided.
+
+                File projectResourceFile = new File( standardResourcesDirectory, projectResource );
+
+                if ( projectResourceFile.exists() )
+                {
+                    continue;
+                }
 
-                File f = new File( outputDirectory, StringUtils.replaceOnce( resource, ".vm", ".txt" ) );
+                File f = new File( outputDirectory, projectResource );
 
                 FileUtils.mkdir( f.getParentFile().getAbsolutePath() );
 
                 Writer writer = new FileWriter( f );
 
-                velocity.getEngine().mergeTemplate( resource, context, writer );
+                velocity.getEngine().mergeTemplate( bundleResource, context, writer );
 
                 writer.close();
             }