Author: brett Date: Fri Aug 12 07:30:10 2011 New Revision: 1156991 URL: http://svn.apache.org/viewvc?rev=1156991&view=rev Log: use Files instead of Strings so that they can be correctly basedir aligned
Modified: incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/SourceProcessorMojo.java incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/TestSourceProcessorMojo.java Modified: incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/SourceProcessorMojo.java URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/SourceProcessorMojo.java?rev=1156991&r1=1156990&r2=1156991&view=diff ============================================================================== --- incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/SourceProcessorMojo.java (original) +++ incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/SourceProcessorMojo.java Fri Aug 12 07:30:10 2011 @@ -49,7 +49,7 @@ public class SourceProcessorMojo * @parameter expression = "${sourceDirectory}" default-value="${project.build.sourceDirectory}" * @required */ - private String sourceDirectory; + private File sourceDirectory; /** * Output directory @@ -57,7 +57,7 @@ public class SourceProcessorMojo * @parameter expression = "${outputDirectory}" default-value="${project.build.directory}/build-sources" * @required */ - private String outputDirectory; + private File outputDirectory; /** * @parameter expression = "${includes}" @@ -87,13 +87,13 @@ public class SourceProcessorMojo { long startTime = System.currentTimeMillis(); - if ( !new File( sourceDirectory ).exists() ) + if ( !sourceDirectory.exists() ) { getLog().info( "NPANDAY-904-001: No source files to copy" ); return; } DirectoryScanner directoryScanner = new DirectoryScanner(); - directoryScanner.setBasedir( sourceDirectory ); + directoryScanner.setBasedir( sourceDirectory.getAbsolutePath() ); List<String> excludeList = new ArrayList<String>(); //target files @@ -135,8 +135,8 @@ public class SourceProcessorMojo { try { - File sourceFile = new File( sourceDirectory + File.separator + file ); - File targetFile = new File( outputDirectory + File.separator + file ); + File sourceFile = new File( sourceDirectory, file ); + File targetFile = new File( outputDirectory, file ); if ( sourceFile.lastModified() > targetFile.lastModified() ) { super.getPluginContext().put( "SOURCE_FILES_UP_TO_DATE", Boolean.FALSE ); Modified: incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/TestSourceProcessorMojo.java URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/TestSourceProcessorMojo.java?rev=1156991&r1=1156990&r2=1156991&view=diff ============================================================================== --- incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/TestSourceProcessorMojo.java (original) +++ incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/TestSourceProcessorMojo.java Fri Aug 12 07:30:10 2011 @@ -48,7 +48,7 @@ public class TestSourceProcessorMojo * @parameter expression = "${sourceDirectory}" default-value="${project.build.testSourceDirectory}" * @required */ - private String sourceDirectory; + private File sourceDirectory; /** * Output directory for the test sources. @@ -56,7 +56,7 @@ public class TestSourceProcessorMojo * @parameter expression = "${outputDirectory}" default-value="${project.build.directory}/build-test-sources" * @required */ - private String outputDirectory; + private File outputDirectory; /** * @parameter expression = "${testExcludes}" @@ -86,13 +86,13 @@ public class TestSourceProcessorMojo { long startTime = System.currentTimeMillis(); - if ( !new File( sourceDirectory ).exists() ) + if ( !sourceDirectory.exists() ) { getLog().info( "NPANDAY-905-001: No test source files to copy" ); return; } DirectoryScanner directoryScanner = new DirectoryScanner(); - directoryScanner.setBasedir( sourceDirectory ); + directoryScanner.setBasedir( sourceDirectory.getAbsolutePath() ); List<String> excludeList = new ArrayList<String>(); excludeList.add( "*.suo" ); @@ -133,8 +133,8 @@ public class TestSourceProcessorMojo { try { - File sourceFile = new File( sourceDirectory + File.separator + file ); - File targetFile = new File( outputDirectory + File.separator + file ); + File sourceFile = new File( sourceDirectory, file ); + File targetFile = new File( outputDirectory, file ); if ( sourceFile.lastModified() > targetFile.lastModified() ) { FileUtils.copyFile( sourceFile, targetFile );