Author: brett Date: Thu Feb 27 03:26:50 2014 New Revision: 1572419 URL: http://svn.apache.org/r1572419 Log: [NPANDAY-210] backwards compat for include sources
Pass the files into the main routine, so that if they are used you don't also get a default **/*.cs as well. Also reinstate the old test source handling. We can remove these in a 2.0.0 release. Modified: incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/compiler/CompilerConfig.java incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/CompilerContextImpl.java 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/components/dotnet-executable/src/main/java/npanday/executable/compiler/CompilerConfig.java URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/compiler/CompilerConfig.java?rev=1572419&r1=1572418&r2=1572419&view=diff ============================================================================== --- incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/compiler/CompilerConfig.java (original) +++ incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/compiler/CompilerConfig.java Thu Feb 27 03:26:50 2014 @@ -44,6 +44,8 @@ public class CompilerConfig private List<String> deprecatedIncludeSourcesConfiguration; + private List<String> deprecatedIncludeTestSourcesConfiguration; + private File outputDirectory; private File assemblyPath; @@ -161,6 +163,24 @@ public class CompilerConfig } /** + * @deprecated Rather use setTestExcludes + setTestIncludes! + * + * @param deprecatedIncludeTestSourcesConfiguration sources file List + */ + public void setDeprecatedIncludeTestSourcesConfiguration( List<String> deprecatedIncludeTestSourcesConfiguration ) + { + this.deprecatedIncludeTestSourcesConfiguration = deprecatedIncludeTestSourcesConfiguration; + } + + /** + * Gets Include Sources + */ + public List<String> getDeprecatedIncludeTestSourcesConfiguration() + { + return deprecatedIncludeTestSourcesConfiguration; + } + + /** * Gets Output Directory */ public File getOutputDirectory() Modified: incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/CompilerContextImpl.java URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/CompilerContextImpl.java?rev=1572419&r1=1572418&r2=1572419&view=diff ============================================================================== --- incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/CompilerContextImpl.java (original) +++ incubator/npanday/trunk/components/dotnet-executable/src/main/java/npanday/executable/impl/CompilerContextImpl.java Thu Feb 27 03:26:50 2014 @@ -465,13 +465,6 @@ public final class CompilerContextImpl private Set<File> expandSourceFiles() { Set<File> files = Sets.newHashSet(); - if ( config.getDeprecatedIncludeSourcesConfiguration() != null ) - { - for ( String file : config.getDeprecatedIncludeSourcesConfiguration() ) - { - files.add( new File( file ) ); - } - } files.addAll( expandSources( getGeneratedSourcesDirectory() ) ); @@ -544,6 +537,10 @@ public final class CompilerContextImpl "NPANDAY-061-012: Expanding main sources" ); List<String> includes = Lists.newArrayList(); + if ( config.getDeprecatedIncludeSourcesConfiguration() != null ) + { + includes.addAll( Lists.newArrayList( config.getDeprecatedIncludeSourcesConfiguration() ) ); + } if ( config.getIncludes() != null ) { includes.addAll( Lists.newArrayList( config.getIncludes() ) ); @@ -575,6 +572,10 @@ public final class CompilerContextImpl "NPANDAY-061-013: Expanding test sources" ); List<String> includes = Lists.newArrayList(); + if ( config.getDeprecatedIncludeTestSourcesConfiguration() != null ) + { + includes.addAll( Lists.newArrayList( config.getDeprecatedIncludeTestSourcesConfiguration() ) ); + } if ( config.getTestIncludes() != null ) { includes.addAll( Lists.newArrayList( config.getTestIncludes() ) ); 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=1572419&r1=1572418&r2=1572419&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:26:50 2014 @@ -1289,6 +1289,22 @@ public abstract class AbstractCompilerMo protected abstract void initializeDefaults() throws MojoExecutionException; + protected ArrayList<String> convertIncludeSourcesConfiguration(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)); + } catch (Exception e) { + throw new MojoExecutionException("Unable to find relative path for source: " + e.getMessage(), e); + } + } + } + return srcs; + } + protected abstract ArrayList<String> getParameters(); protected abstract CompilerRequirement getCompilerRequirement() throws MojoExecutionException; 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=1572419&r1=1572418&r2=1572419&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:26:50 2014 @@ -95,17 +95,9 @@ public final class CompilerMojo compilerConfig.setSourcePatterns(includes, excludes, testIncludes, testExcludes); - // TODO: NPANDAY-210 maybe this should be removed? if ( includeSources != null && includeSources.length != 0 ) { - ArrayList<String> srcs = new ArrayList<String>(); - for(File includeSource : includeSources) - { - if(includeSource.exists()) - { - srcs.add(includeSource.getAbsolutePath()); - } - } + ArrayList<String> srcs = convertIncludeSourcesConfiguration(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=1572419&r1=1572418&r2=1572419&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:26:50 2014 @@ -19,10 +19,7 @@ package npanday.plugin.compile; * under the License. */ -import com.google.common.collect.Lists; import npanday.ArtifactType; -import npanday.PlatformUnsupportedException; -import npanday.assembler.AssemblerContext; import npanday.executable.compiler.CompilerConfig; import npanday.executable.compiler.CompilerRequirement; import npanday.executable.compiler.KeyInfo; @@ -30,7 +27,6 @@ import org.apache.maven.plugin.MojoExecu import java.io.File; import java.util.ArrayList; -import java.util.List; /** * Compiles test classes. @@ -109,19 +105,11 @@ public final class TestCompilerMojo compilerConfig.setSourcePatterns(includes, excludes, testIncludes, testExcludes); - // TODO: NPANDAY-210 maybe this should be removed? if ( testIncludeSources != null && testIncludeSources.length != 0 ) { - ArrayList<String> srcs = new ArrayList<String>(); - for(File includeSource : testIncludeSources) - { - if(includeSource.exists()) - { - srcs.add(includeSource.getAbsolutePath()); - } - } + ArrayList<String> srcs = convertIncludeSourcesConfiguration(testIncludeSources); - compilerConfig.setDeprecatedIncludeSourcesConfiguration( srcs ); + compilerConfig.setDeprecatedIncludeTestSourcesConfiguration(srcs); } @@ -134,8 +122,6 @@ public final class TestCompilerMojo } - - protected ArrayList<String> getParameters() { ArrayList<String> params = new ArrayList<String>();