From 7e65cf62add1d0eed6591f552c0993619048d42f Mon Sep 17 00:00:00 2001 From: John Dennis Casey Date: Thu, 28 Aug 2008 02:09:10 +0000 Subject: [PATCH] [MNG-3731] Detect absolute script directories, and only prepend basedir to relative paths. git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@689698 13f79535-47bb-0310-9956-ffa450edef68 --- .../AbstractScriptedMojoDescriptorExtractor.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/AbstractScriptedMojoDescriptorExtractor.java b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/AbstractScriptedMojoDescriptorExtractor.java index f1ca91d..381c08a 100644 --- a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/AbstractScriptedMojoDescriptorExtractor.java +++ b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/extractor/AbstractScriptedMojoDescriptorExtractor.java @@ -48,6 +48,7 @@ public abstract class AbstractScriptedMojoDescriptorExtractor 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 @@ public abstract class AbstractScriptedMojoDescriptorExtractor 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();