You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ca...@apache.org on 2007/03/13 22:57:01 UTC

svn commit: r517895 - /maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java

Author: carlos
Date: Tue Mar 13 14:57:00 2007
New Revision: 517895

URL: http://svn.apache.org/viewvc?view=rev&rev=517895
Log:
[MECLIPSE-234] EclipsePlugin.extractResourceDirs() reuses String method argument causing maven-eclipse.xml copy-resources problems
Submitted By: Peter Lynch

Modified:
    maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java?view=diff&rev=517895&r1=517894&r2=517895
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java Tue Mar 13 14:57:00 2007
@@ -900,8 +900,11 @@
             .equals( new File( project.getBuild().getOutputDirectory() ) );
         if ( useStandardOutputDir )
         {
+            getLog().debug("testOutput toRelativeAndFixSeparator " + projectBaseDir + " , " + project.getBuild()
+                    .getTestOutputDirectory());
             testOutput = IdeUtils.toRelativeAndFixSeparator( projectBaseDir, new File( project.getBuild()
                 .getTestOutputDirectory() ), false );
+            getLog().debug("testOutput after toRelative : " + testOutput);
         }
 
         extractSourceDirs( directories, project.getTestCompileSourceRoots(), basedir, projectBaseDir, true, testOutput );
@@ -932,11 +935,12 @@
     }
 
     void extractResourceDirs( Set directories, List resources, MavenProject project, File basedir,
-                              File workspaceProjectBaseDir, boolean test, String output )
+                              File workspaceProjectBaseDir, boolean test, final String output )
         throws MojoExecutionException
     {
         for ( Iterator it = resources.iterator(); it.hasNext(); )
         {
+
             Resource resource = (Resource) it.next();
 
             getLog().debug( "Processing resource dir: " + resource.getDirectory() );
@@ -967,10 +971,14 @@
 
             String resourceDir = IdeUtils.toRelativeAndFixSeparator( workspaceProjectBaseDir, resourceDirectory,
                                                                      !workspaceProjectBaseDir.equals( basedir ) );
-
-            if ( output != null )
+            String thisOutput = output;
+            if ( thisOutput != null )
             {
-                File outputFile = new File( workspaceProjectBaseDir, output );
+                // sometimes thisOutput is already an absolute path
+                File outputFile = new File( thisOutput );
+                if(!outputFile.isAbsolute()){
+                    outputFile = new File( workspaceProjectBaseDir, thisOutput );
+                }
                 // create output dir if it doesn't exist
                 outputFile.mkdirs();
 
@@ -981,14 +989,16 @@
                     outputFile.mkdirs();
                 }
 
-                output = IdeUtils.toRelativeAndFixSeparator( workspaceProjectBaseDir, outputFile, false );
+                getLog().debug(
+                        "Making relative and fixing separator: { " + workspaceProjectBaseDir + ", " +  outputFile + ", false }." );
+                thisOutput = IdeUtils.toRelativeAndFixSeparator( workspaceProjectBaseDir, outputFile, false );
             }
 
             getLog().debug(
-                            "Adding eclipse source dir: { " + resourceDir + ", " + output + ", true, " + test + ", "
+                            "Adding eclipse source dir: { " + resourceDir + ", " + thisOutput + ", true, " + test + ", "
                                 + includePattern + ", " + excludePattern + " }." );
 
-            directories.add( new EclipseSourceDir( resourceDir, output, true, test, includePattern, excludePattern,
+            directories.add( new EclipseSourceDir( resourceDir, thisOutput, true, test, includePattern, excludePattern,
                                                    resource.isFiltering() ) );
         }
     }