You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2011/10/29 04:22:46 UTC
svn commit: r1190737 -
/maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java
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 )
{
Re: svn commit: r1190737 - /maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java
Posted by Hervé BOUTEMY <he...@free.fr>.
np: I liked the idea (and was sorry to not have done it before...)
:)
Le Samedi 29 Octobre 2011 09:34:08 Olivier Lamy a écrit :
> Yup, sorry for the issue.
>
> I have fixed that locally but not yet committed as I worked on an other
> issue.
> 2011/10/29 <hb...@apache.org>:
> > 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/m
> > aven/archetype/mojos/IntegrationTestMojo.java URL:
> > http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plug
> > in/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.ja
> > va?rev=1190737&r1=1190736&r2=1190737&view=diff
> > =======================================================================
> > ======= ---
> > maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/m
> > aven/archetype/mojos/IntegrationTestMojo.java (original) +++
> > maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/m
> > aven/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 )
> > {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: svn commit: r1190737 - /maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java
Posted by Olivier Lamy <ol...@apache.org>.
Yup, sorry for the issue.
I have fixed that locally but not yet committed as I worked on an other issue.
2011/10/29 <hb...@apache.org>:
> 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 )
> {
>
>
>
--
Olivier Lamy
Talend : http://talend.com
http://twitter.com/olamy | http://linkedin.com/in/olamy
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org