Return-Path: X-Original-To: apmail-maven-dev-archive@www.apache.org Delivered-To: apmail-maven-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 265C6907D for ; Sat, 29 Oct 2011 07:34:33 +0000 (UTC) Received: (qmail 63884 invoked by uid 500); 29 Oct 2011 07:34:32 -0000 Delivered-To: apmail-maven-dev-archive@maven.apache.org Received: (qmail 63793 invoked by uid 500); 29 Oct 2011 07:34:31 -0000 Mailing-List: contact dev-help@maven.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Maven Developers List" Reply-To: "Maven Developers List" Delivered-To: mailing list dev@maven.apache.org Received: (qmail 63783 invoked by uid 99); 29 Oct 2011 07:34:30 -0000 Received: from minotaur.apache.org (HELO minotaur.apache.org) (140.211.11.9) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 29 Oct 2011 07:34:30 +0000 Received: from localhost (HELO mail-yw0-f43.google.com) (127.0.0.1) (smtp-auth username olamy, mechanism plain) by minotaur.apache.org (qpsmtpd/0.29) with ESMTP; Sat, 29 Oct 2011 07:34:30 +0000 Received: by ywp17 with SMTP id 17so7162078ywp.30 for ; Sat, 29 Oct 2011 00:34:29 -0700 (PDT) Received: by 10.182.225.3 with SMTP id rg3mr1271198obc.77.1319873669084; Sat, 29 Oct 2011 00:34:29 -0700 (PDT) MIME-Version: 1.0 Received: by 10.182.42.233 with HTTP; Sat, 29 Oct 2011 00:34:08 -0700 (PDT) In-Reply-To: <20111029022246.AA04323889E3@eris.apache.org> References: <20111029022246.AA04323889E3@eris.apache.org> From: Olivier Lamy Date: Sat, 29 Oct 2011 09:34:08 +0200 Message-ID: Subject: Re: svn commit: r1190737 - /maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java To: dev@maven.apache.org Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Yup, sorry for the issue. I have fixed that locally but not yet committed as I worked on an other iss= ue. 2011/10/29 : > Author: hboutemy > Date: Sat Oct 29 02:22:46 2011 > New Revision: 1190737 > > URL: http://svn.apache.org/viewvc?rev=3D1190737&view=3Drev > Log: > [ARCHETYPE-387] used testProjectsDirectory parameter introduced in r11905= 46 and fixed its default value > > Modified: > =A0 =A0maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apa= che/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-p= lugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.ja= va?rev=3D1190737&r1=3D1190736&r2=3D1190737&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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 > =A0 =A0 /** > =A0 =A0 =A0* Directory of test projects > =A0 =A0 =A0* > - =A0 =A0 * @parameter expression=3D"${archetype.test.projectsDirectory}"= default-value=3D"${project.build.testOutputDirectory}" > + =A0 =A0 * @parameter expression=3D"${archetype.test.projectsDirectory}"= default-value=3D"${project.build.testOutputDirectory}/projects" > =A0 =A0 =A0* @required > =A0 =A0 =A0* @since 2.2 > =A0 =A0 =A0*/ > @@ -115,9 +115,7 @@ public class IntegrationTestMojo > =A0 =A0 =A0 =A0 =A0 =A0 return; > =A0 =A0 =A0 =A0 } > > - =A0 =A0 =A0 =A0File projectsDirectory =3D new File( project.getBasedir(= ), "target/test-classes/projects" ); > - > - =A0 =A0 =A0 =A0if ( !projectsDirectory.exists() ) > + =A0 =A0 =A0 =A0if ( !testProjectsDirectory.exists() ) > =A0 =A0 =A0 =A0 { > =A0 =A0 =A0 =A0 =A0 =A0 getLog().warn( "No Archetype IT projects: root 'p= rojects' directory not found." ); > > @@ -136,7 +134,7 @@ public class IntegrationTestMojo > =A0 =A0 =A0 =A0 try > =A0 =A0 =A0 =A0 { > =A0 =A0 =A0 =A0 =A0 =A0 @SuppressWarnings( "unchecked" ) List proje= ctsGoalFiles =3D > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0FileUtils.getFiles( projectsDirectory, "= */goal.txt", "" ); > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0FileUtils.getFiles( testProjectsDirector= y, "*/goal.txt", "" ); > > =A0 =A0 =A0 =A0 =A0 =A0 if ( projectsGoalFiles.size() =3D=3D 0 ) > =A0 =A0 =A0 =A0 =A0 =A0 { > > > --=20 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