svn commit: r603295 - /maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java

[dkulp]

Author: dkulp
Date: Tue Dec 11 08:49:18 2007
New Revision: 603295

URL: http://svn.apache.org/viewvc?rev=603295&view=rev
Log:
Fixes for install of source jar

Modified:
    
maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java

Modified: 
maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java?rev=603295&r1=603294&r2=603295&view=diff
==============================================================================
--- 
maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
 (original)
+++ 
maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
 Tue Dec 11 08:49:18 2007
@@ -289,7 +289,8 @@
                 if ( createSourcesJar ) 
                 {
                     file = shadedSourcesArtifactFile();
-                    replaceFile( sourcesJar, file );
+                    
+                    replaceFile( file, sourcesJar );
                     
                     projectHelper.attachArtifact( project, "jar",
                                                   "sources", file );
@@ -309,8 +310,10 @@
 
     private void replaceFile(File oldFile, File newFile) throws 
MojoExecutionException
     {
+        getLog().info("Replacing " + oldFile + " with " + newFile);
+        
         File origFile = new File( outputDirectory, "original-" + 
oldFile.getName() );
-        if ( !oldFile.renameTo( origFile ) )
+        if ( oldFile.exists() && !oldFile.renameTo( origFile ) )
         {
             //try a gc to see if an unclosed stream needs garbage collecting
             System.gc();