Return-Path: X-Original-To: apmail-maven-commits-archive@www.apache.org Delivered-To: apmail-maven-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E27856FAD for ; Tue, 2 Aug 2011 19:57:58 +0000 (UTC) Received: (qmail 35947 invoked by uid 500); 2 Aug 2011 19:57:58 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 35853 invoked by uid 500); 2 Aug 2011 19:57:57 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 35846 invoked by uid 99); 2 Aug 2011 19:57:57 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Aug 2011 19:57:57 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Aug 2011 19:57:55 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B691A238890D; Tue, 2 Aug 2011 19:57:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1153259 - in /maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype: ./ src/main/resources/META-INF/maven/ src/main/resources/archetype-resources/src/main/java/ src/main/resources/archetype-resources/src/main/resources/ src/m... Date: Tue, 02 Aug 2011 19:57:35 -0000 To: commits@maven.apache.org From: hboutemy@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110802195735.B691A238890D@eris.apache.org> Author: hboutemy Date: Tue Aug 2 19:57:33 2011 New Revision: 1153259 URL: http://svn.apache.org/viewvc?rev=1153259&view=rev Log: added properties in file path replacement Added: maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/src/main/resources/archetype-resources/src/main/resources/ maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/src/main/resources/archetype-resources/src/main/resources/__packageInPathFormat__/ maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/src/main/resources/archetype-resources/src/main/resources/__packageInPathFormat__/__package__.properties (with props) maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/src/main/resources/archetype-resources/src/main/resources/test-__artifactId__.properties (with props) Modified: maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/pom.xml maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/src/main/resources/archetype-resources/src/main/java/App.java maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/verify.bsh Modified: maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/pom.xml URL: http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/pom.xml?rev=1153259&r1=1153258&r2=1153259&view=diff ============================================================================== --- maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/pom.xml (original) +++ maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/pom.xml Tue Aug 2 19:57:33 2011 @@ -29,6 +29,7 @@ under the License. maven-archetype build-archetype + packages an archetype then runs IT (archetype:integration-test) Modified: maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml URL: http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=1153259&r1=1153258&r2=1153259&view=diff ============================================================================== --- maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml (original) +++ maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml Tue Aug 2 19:57:33 2011 @@ -30,5 +30,11 @@ under the License. **/*.java + + src/main/resources + + **/*.properties + + Modified: maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/src/main/resources/archetype-resources/src/main/java/App.java URL: http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/src/main/resources/archetype-resources/src/main/java/App.java?rev=1153259&r1=1153258&r2=1153259&view=diff ============================================================================== --- maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/src/main/resources/archetype-resources/src/main/java/App.java (original) +++ maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/src/main/resources/archetype-resources/src/main/java/App.java Tue Aug 2 19:57:33 2011 @@ -28,5 +28,9 @@ public class App public static void main( String[] args ) { System.out.println( "Hello World!" ); + System.out.println( "groupId = ${groupId}" ); + System.out.println( "artifactId = ${artifactId}" ); + System.out.println( "package = ${package}" ); + System.out.println( "packageInPathFormat = ${packageInPathFormat}" ); } } Added: maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/src/main/resources/archetype-resources/src/main/resources/__packageInPathFormat__/__package__.properties URL: http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/src/main/resources/archetype-resources/src/main/resources/__packageInPathFormat__/__package__.properties?rev=1153259&view=auto ============================================================================== --- maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/src/main/resources/archetype-resources/src/main/resources/__packageInPathFormat__/__package__.properties (added) +++ maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/src/main/resources/archetype-resources/src/main/resources/__packageInPathFormat__/__package__.properties Tue Aug 2 19:57:33 2011 @@ -0,0 +1,3 @@ +# test file path __propertyName__ replacement with its value +# __packageInPathFormat__ in file directory was replaced with "${packageInPathFormat}" +# __package__ in filename was replaced with "${package}" Propchange: maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/src/main/resources/archetype-resources/src/main/resources/__packageInPathFormat__/__package__.properties ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/src/main/resources/archetype-resources/src/main/resources/__packageInPathFormat__/__package__.properties ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Propchange: maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/src/main/resources/archetype-resources/src/main/resources/__packageInPathFormat__/__package__.properties ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/src/main/resources/archetype-resources/src/main/resources/test-__artifactId__.properties URL: http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/src/main/resources/archetype-resources/src/main/resources/test-__artifactId__.properties?rev=1153259&view=auto ============================================================================== --- maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/src/main/resources/archetype-resources/src/main/resources/test-__artifactId__.properties (added) +++ maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/src/main/resources/archetype-resources/src/main/resources/test-__artifactId__.properties Tue Aug 2 19:57:33 2011 @@ -0,0 +1,3 @@ +# test file path __propertyName__ replacement with its value +# __artifactId__ in filename was replaced with "${artifactId}" +# rootArtifactId = ${rootArtifactId} Propchange: maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/src/main/resources/archetype-resources/src/main/resources/test-__artifactId__.properties ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/src/main/resources/archetype-resources/src/main/resources/test-__artifactId__.properties ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Propchange: maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/src/main/resources/archetype-resources/src/main/resources/test-__artifactId__.properties ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/verify.bsh URL: http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/verify.bsh?rev=1153259&r1=1153258&r2=1153259&view=diff ============================================================================== --- maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/verify.bsh (original) +++ maven/archetype/trunk/maven-archetype-plugin/src/it/build-archetype/verify.bsh Tue Aug 2 19:57:33 2011 @@ -20,10 +20,26 @@ import java.io.*; -File target = new File( basedir, "target/test-classes/projects/basic/project/basic/src/main/java/build/archetype/App.java" ); -if ( !target.isFile() ) +File main = new File( basedir, "target/test-classes/projects/basic/project/basic/src/main" ); + +// check +File app = new File( main, "java/build/archetype/App.java" ); +if ( !app.isFile() ) +{ + throw new Exception( app + " file is missing or not a file." ); +} + +// check __propertyName__ path replacement +File artifactId = new File( main, "resources/test-basic.properties" ); +if ( !artifactId.isFile() ) +{ + throw new Exception( artifactId + " file is missing or not a file." ); +} + +File packageInPathFormat = new File( main, "resources/build/archetype/build.archetype.properties" ); +if ( !packageInPathFormat.isFile() ) { - throw new Exception( target + " file is missing or not a file." ); + throw new Exception( packageInPathFormat + " file is missing or not a file." ); } return true;