Author: hboutemy
Date: Sat Oct 29 02:22:46 2011
New Revision: 1190737
URL: http://svn.apache.org/viewvc?rev=1190737&view=rev
Log:
[ARCHETYPE-387] used testProjectsDirectory parameter introduced in r1190546 and
fixed its default value
Modified:
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java
Modified:
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java?rev=1190737&r1=1190736&r2=1190737&view=diff
==============================================================================
---
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java
(original)
+++
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java
Sat Oct 29 02:22:46 2011
@@ -101,7 +101,7 @@ public class IntegrationTestMojo
/**
* Directory of test projects
*
- * @parameter expression="${archetype.test.projectsDirectory}"
default-value="${project.build.testOutputDirectory}"
+ * @parameter expression="${archetype.test.projectsDirectory}"
default-value="${project.build.testOutputDirectory}/projects"
* @required
* @since 2.2
*/
@@ -115,9 +115,7 @@ public class IntegrationTestMojo
return;
}
- File projectsDirectory = new File( project.getBasedir(),
"target/test-classes/projects" );
-
- if ( !projectsDirectory.exists() )
+ if ( !testProjectsDirectory.exists() )
{
getLog().warn( "No Archetype IT projects: root 'projects'
directory not found." );
@@ -136,7 +134,7 @@ public class IntegrationTestMojo
try
{
@SuppressWarnings( "unchecked" ) List<File> projectsGoalFiles =
- FileUtils.getFiles( projectsDirectory, "*/goal.txt", "" );
+ FileUtils.getFiles( testProjectsDirectory, "*/goal.txt", "" );
if ( projectsGoalFiles.size() == 0 )
{