You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2008/08/28 04:09:10 UTC

svn commit: r689698 - /maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/AbstractScriptedMojoDescriptorExtractor.java

Author: jdcasey
Date: Wed Aug 27 19:09:10 2008
New Revision: 689698

URL: http://svn.apache.org/viewvc?rev=689698&view=rev
Log:
[MNG-3731] Detect absolute script directories, and only prepend basedir to relative paths.

Modified:
    maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/AbstractScriptedMojoDescriptorExtractor.java

Modified: maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/AbstractScriptedMojoDescriptorExtractor.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/AbstractScriptedMojoDescriptorExtractor.java?rev=689698&r1=689697&r2=689698&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/AbstractScriptedMojoDescriptorExtractor.java (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/AbstractScriptedMojoDescriptorExtractor.java Wed Aug 27 19:09:10 2008
@@ -48,6 +48,7 @@
     public List execute( MavenProject project, PluginDescriptor pluginDescriptor )
         throws ExtractionException, InvalidPluginDescriptorException
     {
+        getLogger().info( "Running: " + getClass().getName() );
         String metadataExtension = getMetadataFileExtension();
         String scriptExtension = getScriptFileExtension();
 
@@ -142,7 +143,12 @@
 
             String resourceDir = (String) it.next();
 
-            File dir = new File( basedir, resourceDir ).getAbsoluteFile();
+            getLogger().info( "Scanning script dir: " + resourceDir + " with extractor: " + getClass().getName() );
+            File dir = new File( resourceDir );
+            if ( !dir.isAbsolute() )
+            {
+                dir = new File( basedir, resourceDir ).getAbsoluteFile();
+            }
 
             resourceDir = dir.getPath();