Return-Path: 
 <commits-return-30936-apmail-maven-commits-archive=maven.apache.org@maven.apache.org>
Delivered-To: apmail-maven-commits-archive@www.apache.org
Received: (qmail 80662 invoked from network); 1 Jun 2010 03:49:48 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 1 Jun 2010 03:49:48 -0000
Received: (qmail 94061 invoked by uid 500); 1 Jun 2010 03:49:48 -0000
Delivered-To: apmail-maven-commits-archive@maven.apache.org
Received: (qmail 93855 invoked by uid 500); 1 Jun 2010 03:49:46 -0000
Mailing-List: contact commits-help@maven.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@maven.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@maven.apache.org>
List-Post: <mailto:commits@maven.apache.org>
List-Id: <commits.maven.apache.org>
Reply-To: dev@maven.apache.org
Delivered-To: mailing list commits@maven.apache.org
Received: (qmail 93848 invoked by uid 99); 1 Jun 2010 03:49:46 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Jun 2010 03:49:46 +0000
X-ASF-Spam-Status: No, hits=-1432.6 required=10.0
	tests=ALL_TRUSTED,AWL
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, 01 Jun 2010 03:49:45 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 6CEFA238890A; Tue,  1 Jun 2010 03:49:25 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r949918 - in
 /maven/plugins/trunk/maven-antrun-plugin/src:
 it/properties-test/build.xml it/properties-test/pom.xml
 main/java/org/apache/maven/plugin/antrun/AbstractAntMojo.java
Date: Tue, 01 Jun 2010 03:49:25 -0000
To: commits@maven.apache.org
From: pgier@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100601034925.6CEFA238890A@eris.apache.org>

Author: pgier
Date: Tue Jun  1 03:49:25 2010
New Revision: 949918

URL: http://svn.apache.org/viewvc?rev=949918&view=rev
Log:
[MANTRUN-140] Fix property name for testOutputDirectory and test for this in ITs

Modified:
    maven/plugins/trunk/maven-antrun-plugin/src/it/properties-test/build.xml
    maven/plugins/trunk/maven-antrun-plugin/src/it/properties-test/pom.xml
    maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AbstractAntMojo.java

Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/properties-test/build.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/properties-test/build.xml?rev=949918&r1=949917&r2=949918&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/it/properties-test/build.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/properties-test/build.xml Tue Jun  1 03:49:25 2010
@@ -13,7 +13,31 @@
     <fail unless="junit:junit:jar" message="Property not set \${junit:junit:jar}"/>    
     <echo message="maven.dependency.junit.junit.jar.path : ${maven.dependency.junit.junit.jar.path}"/>
     <fail unless="maven.dependency.junit.junit.jar.path" message="Property not set \${maven.dependency.junit.junit.jar.path}"/>
-      
+    
+    <property name="outputDir" location="./target/classes"/>
+    <echo message="outputDir: ${outputDir}"/>
+    <property name="outputDirProp" location="${project.build.outputDirectory}"/>
+    <echo message="outputDirProp: ${outputDirProp}"/>
+    <fail message="Incorrect output dir property">
+      <condition>
+        <not>
+          <equals arg1="${outputDir}" arg2="${outputDirProp}"/>
+        </not>
+      </condition>
+    </fail>
+    
+    <property name="testOutputDir" location="./target/test-stuff"/>
+    <echo message="testOutputDir ${testOutputDir}"/>
+    <property name="testOutputDirProp" location="${project.build.testOutputDirectory}"/>
+    <echo message="testOutputDirProp: ${testOutputDirProp}"/>
+    <fail message="Incorrect test output dir prop">
+      <condition>
+        <not>
+          <equals arg1="${testOutputDir}" arg2="${testOutputDirProp}"/>
+        </not>
+      </condition>
+    </fail>
+
   </target>
 
 </project>

Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/properties-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/properties-test/pom.xml?rev=949918&r1=949917&r2=949918&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/it/properties-test/pom.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/properties-test/pom.xml Tue Jun  1 03:49:25 2010
@@ -19,6 +19,7 @@
   </dependencies>
 
   <build>
+    <testOutputDirectory>target/test-stuff</testOutputDirectory>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

Modified: maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AbstractAntMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AbstractAntMojo.java?rev=949918&r1=949917&r2=949918&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AbstractAntMojo.java (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AbstractAntMojo.java Tue Jun  1 03:49:25 2010
@@ -289,7 +289,7 @@ public abstract class AbstractAntMojo
         antProject.setProperty( ( propertyPrefix + "project.packaging" ), mavenProject.getPackaging() );
         antProject.setProperty( ( propertyPrefix + "project.build.directory" ), mavenProject.getBuild().getDirectory() );
         antProject.setProperty( ( propertyPrefix + "project.build.outputDirectory" ), mavenProject.getBuild().getOutputDirectory() );
-        antProject.setProperty( ( propertyPrefix + "project.build.outputDirectory" ), mavenProject.getBuild().getTestOutputDirectory() );
+        antProject.setProperty( ( propertyPrefix + "project.build.testOutputDirectory" ), mavenProject.getBuild().getTestOutputDirectory() );
         antProject.setProperty( ( propertyPrefix + "project.build.sourceDirectory" ), mavenProject.getBuild().getSourceDirectory() );
         antProject.setProperty( ( propertyPrefix + "project.build.testSourceDirectory" ), mavenProject.getBuild().getTestSourceDirectory() );