Fix error due to makeRelativePath.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@114491 13f79535-47bb-0310-9956-ffa450edef68

jdiff/plugin.jelly

@@ -41,13 +41,12 @@
         <ant:property name="maven.jdiff.new.dir" value="${maven.jdiff.dir}/${maven.jdiff.new.tag}"/>  
         <ant:mkdir dir="${maven.jdiff.new.dir}"/>
 
-        <maven:makeRelativePath var="mavenRelativeSrcDir" basedir="${basedir}" path="${maven.build.sourceDirectory}" />
         <ant:cvs
           cvsRoot="${pom.repository.cvsRoot}"
-          package="${pom.repository.cvsModule}/${mavenRelativeSrcDir}"
+          package="${pom.repository.cvsModule}"
           dest="${maven.jdiff.new.dir}"
           tag="${maven.jdiff.new.tag}"
-        />
+        />    
         <ant:property name="maven.jdiff.new.src" 
           value="${maven.jdiff.new.dir}/${pom.repository.cvsModule}/${relativeSrcDir}"/>
     
@@ -65,10 +64,9 @@
           value="${maven.jdiff.dir}/${maven.jdiff.old.tag}"/>  
         <ant:mkdir dir="${maven.jdiff.old.dir}"/>
 
-        <maven:makeRelativePath var="mavenRelativeSrcDir" basedir="${basedir}" path="${maven.build.sourceDirectory}" />
         <ant:cvs
           cvsRoot="${pom.repository.cvsRoot}"
-          package="${pom.repository.cvsModule}/${mavenRelativeSrcDir}"
+          package="${pom.repository.cvsModule}"
           dest="${maven.jdiff.old.dir}"
           tag="${maven.jdiff.old.tag}"
         />
@@ -77,19 +75,17 @@
           value="${maven.jdiff.old.dir}/${pom.repository.cvsModule}/${relativeSrcDir}"/>
       </j:otherwise>
     </j:choose>
-
     
     <ant:property name="maven.cp.sub" refid="maven-classpath"/>
-    <ant:property name="maven.cp" value="${maven.cp.sub};${java.class.path}"/>
+    <ant:property name="jdiff.jar" value="${plugin.getDependencyPath('jdiff')}"/>
+    <ant:property name="maven.cp" value="${maven.cp.sub};${jdiff.jar};${java.class.path}"/>
 
-    <ant:property name="baseuri" value="${maven.home}/plugins/jdiff"/>
+    <ant:property name="baseuri" value="${plugin.dir}"/>
     
     <ant:javadoc 
       sourcepath="${maven.jdiff.old.src}"
-      packagenames="${pom.package}.*"
-      >
-      <ant:doclet name="jdiff.JDiff"
-        path="${maven.cp}">
+      packagenames="${pom.package}.*">
+      <ant:doclet name="jdiff.JDiff" path="${maven.cp}">
         <ant:param name="-apiname" value="${maven.jdiff.old.tag}"/>
         <ant:param name="-baseURI" value="${baseuri}"/>
       </ant:doclet>
@@ -99,8 +95,7 @@
       packagenames="${pom.package}.*"
       sourcepath="${maven.jdiff.new.src}">
       
-      <ant:doclet name="jdiff.JDiff"
-        path="${maven.cp}">
+      <ant:doclet name="jdiff.JDiff" path="${maven.cp}">
         <ant:param name="-apiname" value="${maven.jdiff.new.tag}"/>
         <ant:param name="-baseURI" value="${baseuri}"/>
       </ant:doclet>
@@ -110,8 +105,7 @@
       private="yes"
       destdir="${maven.jdiff.changes.dir}"
       packagenames="${pom.package}.*"
-      sourcepath="${maven.jdiff.new.src}"
-      >
+      sourcepath="${maven.jdiff.new.src}">
 
       <ant:doclet name="jdiff.JDiff" path="${maven.cp}">
         <ant:param name="-stats"/>
@@ -122,11 +116,11 @@
 
     </ant:javadoc> 
     
-    <ant:copy todir="${maven.jdiff.changes.dir}">
-      <ant:fileset dir="${maven.home}/plugins/jdiff-maven-plugin-1.0">
+   <ant:copy todir="${maven.jdiff.changes.dir}">
+      <ant:fileset dir="${plugin.resources}">
         <ant:include name="*.gif"/>
       </ant:fileset>
-    </ant:copy> 
+    </ant:copy>
     
   </goal>
 

jdiff/project.xml

@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-jdiff-plugin</id>
   <name>Maven JDiff Plugin</name>
-  <currentVersion>1.1</currentVersion>
+  <currentVersion>1.2-SNAPSHOT</currentVersion>
   <description/>
   <shortDescription>Diff between CVS releases</shortDescription>
   <url>http://maven.apache.org/reference/plugins/jdiff/</url>
@@ -34,6 +34,15 @@
         <role>Release Manager</role>
       </roles>
     </developer>
+    <developer>
+      <name>Emmanuel Venisse</name>
+      <id>evenisse</id>
+      <email>emmanuel@venisse.net</email>
+      <organization/>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
   </developers>
   <dependencies>
     <dependency>

jdiff/xdocs/changes.xml

@@ -7,6 +7,9 @@
   </properties>
 
   <body>
+    <release version="1.2" date="In CVS">
+      <action dev="evenisse" type="update">Fix error due to makeRelativePath.</action>
+    </release>
     <release version="1.1" date="2003-09-29">
       <action dev="dion" type="update">update to use maven.docs.*/maven.gen.docs</action>
     </release>