From 569b96374d9434a9c7b1eced6808943fde8c3a7f Mon Sep 17 00:00:00 2001
From: Vincent Siveton <vsiveton@apache.org>
Date: Sat, 8 Mar 2008 14:26:35 +0000
Subject: [PATCH] MPLUGIN-82: Fix test for javadoc tools Submitted by: Benjamin
 Bentmann Reviewed by: Vincent Siveton

o applied

git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@634974 13f79535-47bb-0310-9956-ffa450edef68
---
 maven-plugin-tools-javadoc/pom.xml            | 29 ++++++++++++++++++-
 .../plugin/javadoc/JavadocReportTest.java     |  2 +-
 .../unit/javadoc/javadoc-plugin-config.xml    |  2 +-
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/maven-plugin-tools-javadoc/pom.xml b/maven-plugin-tools-javadoc/pom.xml
index e568b86..a118cd0 100644
--- a/maven-plugin-tools-javadoc/pom.xml
+++ b/maven-plugin-tools-javadoc/pom.xml
@@ -102,6 +102,30 @@
 
       <build>
         <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <version>1.1</version>
+            <executions>
+               <execution>
+                  <id>it-test</id>
+                  <phase>process-test-resources</phase>
+                  <goals>
+                     <goal>run</goal>
+                  </goals>
+                  <configuration>
+                    <tasks>
+                      <copy todir="${project.build.testOutputDirectory}/unit" encoding="ISO-8859-1" overwrite="true">
+                        <fileset dir="${basedir}/src/test/resources/unit" includes="**/*.xml"/>
+                        <filterset>
+                          <filter token="project.version" value="${project.version}"/>
+                        </filterset>
+                      </copy>
+                    </tasks>
+                  </configuration>
+               </execution>
+            </executions>
+          </plugin>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-jar-plugin</artifactId>
@@ -112,6 +136,9 @@
                   <goals>
                      <goal>jar</goal>
                   </goals>
+                  <configuration>
+                    <finalName>${project.build.finalName}-it</finalName>
+                  </configuration>
                </execution>
             </executions>
           </plugin>
@@ -127,7 +154,7 @@
                   <goal>install-file</goal>
                 </goals>
                 <configuration>
-                  <file>${project.build.directory}/${project.build.finalName}.jar</file>
+                  <file>${project.build.directory}/${project.build.finalName}-it.jar</file>
                   <groupId>${project.groupId}</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
diff --git a/maven-plugin-tools-javadoc/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocReportTest.java b/maven-plugin-tools-javadoc/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocReportTest.java
index 028536e..86cb02a 100644
--- a/maven-plugin-tools-javadoc/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocReportTest.java
+++ b/maven-plugin-tools-javadoc/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocReportTest.java
@@ -105,7 +105,7 @@ public class JavadocReportTest
     public void testMojoTaglets()
         throws Exception
     {
-        File testPom = new File( getBasedir(), "src/test/resources/unit/javadoc/javadoc-plugin-config.xml" );
+        File testPom = new File( getBasedir(), "target/test-classes/unit/javadoc/javadoc-plugin-config.xml" );
         PlexusConfiguration pluginConfiguration = extractPluginConfiguration( "maven-javadoc-plugin", testPom );
 
         JavadocReport mojo = (JavadocReport) lookupMojo( "org.apache.maven.plugins", "maven-javadoc-plugin", "2.3",
diff --git a/maven-plugin-tools-javadoc/src/test/resources/unit/javadoc/javadoc-plugin-config.xml b/maven-plugin-tools-javadoc/src/test/resources/unit/javadoc/javadoc-plugin-config.xml
index a9e39e4..bd33f5f 100644
--- a/maven-plugin-tools-javadoc/src/test/resources/unit/javadoc/javadoc-plugin-config.xml
+++ b/maven-plugin-tools-javadoc/src/test/resources/unit/javadoc/javadoc-plugin-config.xml
@@ -114,7 +114,7 @@ under the License.
           <tagletArtifact>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-tools-javadoc</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>@project.version@</version>
           </tagletArtifact>
         </configuration>
       </plugin>