svn commit: r1572425 - in /incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile: AbstractCompilerMojo.java CompilerMojo.java TestCompilerMojo.java

[br...@apache.org]

Author: brett
Date: Thu Feb 27 03:40:26 2014
New Revision: 1572425

URL: http://svn.apache.org/r1572425
Log:
[NPANDAY-210] source needs to be relative to source directory

Modified:
    incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AbstractCompilerMojo.java
    incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/CompilerMojo.java
    incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/TestCompilerMojo.java

Modified: incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AbstractCompilerMojo.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AbstractCompilerMojo.java?rev=1572425&r1=1572424&r2=1572425&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AbstractCompilerMojo.java (original)
+++ incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AbstractCompilerMojo.java Thu Feb 27 03:40:26 2014
@@ -1289,14 +1289,16 @@ public abstract class AbstractCompilerMo
 
     protected abstract void initializeDefaults() throws MojoExecutionException;
 
-    protected ArrayList<String> convertIncludeSourcesConfiguration(File[] includeSources) throws MojoExecutionException {
+    protected ArrayList<String> convertIncludeSourcesConfiguration(String srcDir, File[] includeSources) throws MojoExecutionException {
         ArrayList<String> srcs = new ArrayList<String>();
         for(File includeSource : includeSources)
         {
             if(includeSource.exists())
             {
                 try {
-                    srcs.add(org.apache.tools.ant.util.FileUtils.getRelativePath(project.getBasedir(), includeSource));
+                    // each include is specified relative to the project directory, but the patterns we want are
+                    // relative to the source directory
+                    srcs.add(org.apache.tools.ant.util.FileUtils.getRelativePath(new File(srcDir), includeSource.getAbsoluteFile()));
                 } catch (Exception e) {
                     throw new MojoExecutionException("Unable to find relative path for source: " + e.getMessage(), e);
                 }

Modified: incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/CompilerMojo.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/CompilerMojo.java?rev=1572425&r1=1572424&r2=1572425&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/CompilerMojo.java (original)
+++ incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/CompilerMojo.java Thu Feb 27 03:40:26 2014
@@ -97,7 +97,7 @@ public final class CompilerMojo
 
         if ( includeSources != null && includeSources.length != 0 )
         {
-            ArrayList<String> srcs = convertIncludeSourcesConfiguration(includeSources);
+            ArrayList<String> srcs = convertIncludeSourcesConfiguration(project.getBuild().getSourceDirectory(), includeSources);
 
           	compilerConfig.setDeprecatedIncludeSourcesConfiguration( srcs );
         }

Modified: incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/TestCompilerMojo.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/TestCompilerMojo.java?rev=1572425&r1=1572424&r2=1572425&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/TestCompilerMojo.java (original)
+++ incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/TestCompilerMojo.java Thu Feb 27 03:40:26 2014
@@ -107,7 +107,7 @@ public final class TestCompilerMojo
 
         if ( testIncludeSources != null && testIncludeSources.length != 0 )
         {
-            ArrayList<String> srcs = convertIncludeSourcesConfiguration(testIncludeSources);
+            ArrayList<String> srcs = convertIncludeSourcesConfiguration(project.getBuild().getTestSourceDirectory(), testIncludeSources);
 
             compilerConfig.setDeprecatedIncludeTestSourcesConfiguration(srcs);
         }