Explicity use ant name space. In prep for removal of jeez etc
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113234 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -11,120 +11,119 @@
|
||||
<goal name="jdiff" prereqs="xdoc:init"
|
||||
description="generate an api difference report between versions">
|
||||
|
||||
<property name="maven.jdiff.dir" value="${maven.build.dir}/jdiff"/>
|
||||
<mkdir dir="${maven.jdiff.dir}"/>
|
||||
<ant:property name="maven.jdiff.dir" value="${maven.build.dir}/jdiff"/>
|
||||
<ant:mkdir dir="${maven.jdiff.dir}"/>
|
||||
|
||||
<j:set var="docsDest"
|
||||
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}"/>
|
||||
<j:set var="javadocDestdir"
|
||||
value="${pom.getPluginContext('maven-javadoc-plugin').getVariable('maven.javadoc.destdir')}"/>
|
||||
|
||||
<property name="maven.jdiff.changes.dir" value="${docsDest}/jdiff"/>
|
||||
<mkdir dir="${maven.jdiff.changes.dir}"/>
|
||||
<ant:property name="maven.jdiff.changes.dir" value="${docsDest}/jdiff"/>
|
||||
<ant:mkdir dir="${maven.jdiff.changes.dir}"/>
|
||||
|
||||
<condition property="maven.jdiff.new.current" value="true">
|
||||
<equals arg1="${maven.jdiff.new.tag}" arg2="CURRENT"/>
|
||||
</condition>
|
||||
<ant:condition property="maven.jdiff.new.current" value="true">
|
||||
<ant:equals arg1="${maven.jdiff.new.tag}" arg2="CURRENT"/>
|
||||
</ant:condition>
|
||||
|
||||
<condition property="maven.jdiff.old.current" value="true">
|
||||
<equals arg1="${maven.jdiff.old.tag}" arg2="CURRENT"/>
|
||||
</condition>
|
||||
<ant:condition property="maven.jdiff.old.current" value="true">
|
||||
<ant:equals arg1="${maven.jdiff.old.tag}" arg2="CURRENT"/>
|
||||
</ant:condition>
|
||||
|
||||
<j:choose>
|
||||
<j:choose>
|
||||
|
||||
<j:when test="${maven.jdiff.new.current}">
|
||||
|
||||
<property name="maven.jdiff.new.src" value="${pom.build.SourceDirectory}"/>
|
||||
<j:when test="${maven.jdiff.new.current}">
|
||||
<ant:property name="maven.jdiff.new.src" value="${pom.build.SourceDirectory}"/>
|
||||
</j:when>
|
||||
|
||||
<j:otherwise>
|
||||
<ant:property name="maven.jdiff.new.dir" value="${maven.jdiff.dir}/${maven.jdiff.new.tag}"/>
|
||||
<ant:mkdir dir="${maven.jdiff.new.dir}"/>
|
||||
|
||||
</j:when>
|
||||
<j:otherwise>
|
||||
|
||||
<property name="maven.jdiff.new.dir" value="${maven.jdiff.dir}/${maven.jdiff.new.tag}"/>
|
||||
<mkdir dir="${maven.jdiff.new.dir}"/>
|
||||
|
||||
<cvs
|
||||
cvsRoot="${pom.repository.cvsRoot}"
|
||||
package="${pom.repository.cvsModule}/${maven.build.sourceDirectory}"
|
||||
dest="${maven.jdiff.new.dir}"
|
||||
tag="${maven.jdiff.new.tag}"
|
||||
/>
|
||||
<property name="maven.jdiff.new.src" value="${maven.jdiff.new.dir}/${pom.repository.cvsModule}/${pom.build.SourceDirectory}"/>
|
||||
<ant:cvs
|
||||
cvsRoot="${pom.repository.cvsRoot}"
|
||||
package="${pom.repository.cvsModule}/${maven.build.sourceDirectory}"
|
||||
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}/${pom.build.SourceDirectory}"/>
|
||||
|
||||
</j:otherwise>
|
||||
</j:choose>
|
||||
</j:choose>
|
||||
|
||||
<j:choose>
|
||||
<j:choose>
|
||||
|
||||
<j:when test="${maven.jdiff.old.current}">
|
||||
<property name="maven.jdiff.old.src" value="${pom.build.SourceDirectory}"/>
|
||||
|
||||
|
||||
</j:when>
|
||||
<j:otherwise>
|
||||
<j:when test="${maven.jdiff.old.current}">
|
||||
<ant:property name="maven.jdiff.old.src" value="${pom.build.SourceDirectory}"/>
|
||||
</j:when>
|
||||
|
||||
<property name="maven.jdiff.old.dir" value="${maven.jdiff.dir}/${maven.jdiff.old.tag}"/>
|
||||
<mkdir dir="${maven.jdiff.old.dir}"/>
|
||||
<j:otherwise>
|
||||
<ant:property name="maven.jdiff.old.dir"
|
||||
value="${maven.jdiff.dir}/${maven.jdiff.old.tag}"/>
|
||||
<ant:mkdir dir="${maven.jdiff.old.dir}"/>
|
||||
|
||||
<cvs
|
||||
cvsRoot="${pom.repository.cvsRoot}"
|
||||
package="${pom.repository.cvsModule}/${maven.build.sourceDirectory}"
|
||||
dest="${maven.jdiff.old.dir}"
|
||||
tag="${maven.jdiff.old.tag}"
|
||||
/>
|
||||
<ant:cvs
|
||||
cvsRoot="${pom.repository.cvsRoot}"
|
||||
package="${pom.repository.cvsModule}/${maven.build.sourceDirectory}"
|
||||
dest="${maven.jdiff.old.dir}"
|
||||
tag="${maven.jdiff.old.tag}"
|
||||
/>
|
||||
|
||||
<property name="maven.jdiff.old.src" value="${maven.jdiff.old.dir}/${pom.repository.cvsModule}/${pom.build.SourceDirectory}"/>
|
||||
</j:otherwise>
|
||||
</j:choose>
|
||||
<ant:property name="maven.jdiff.old.src"
|
||||
value="${maven.jdiff.old.dir}/${pom.repository.cvsModule}/${pom.build.SourceDirectory}"/>
|
||||
</j:otherwise>
|
||||
</j:choose>
|
||||
|
||||
|
||||
<property name="maven.cp.sub" refid="maven-classpath"/>
|
||||
<property name="maven.cp" value="${maven.cp.sub};${java.class.path}"/>
|
||||
<ant:property name="maven.cp.sub" refid="maven-classpath"/>
|
||||
<ant:property name="maven.cp" value="${maven.cp.sub};${java.class.path}"/>
|
||||
|
||||
<property name="baseuri" value="${maven.home}/plugins/jdiff"/>
|
||||
<ant:property name="baseuri" value="${maven.home}/plugins/jdiff"/>
|
||||
|
||||
<javadoc
|
||||
<ant:javadoc
|
||||
sourcepath="${maven.jdiff.old.src}"
|
||||
packagenames="${pom.package}.*"
|
||||
>
|
||||
<doclet name="jdiff.JDiff"
|
||||
<ant:doclet name="jdiff.JDiff"
|
||||
path="${maven.cp}">
|
||||
<param name="-apiname" value="${maven.jdiff.old.tag}"/>
|
||||
<param name="-baseURI" value="${baseuri}"/>
|
||||
</doclet>
|
||||
</javadoc>
|
||||
<ant:param name="-apiname" value="${maven.jdiff.old.tag}"/>
|
||||
<ant:param name="-baseURI" value="${baseuri}"/>
|
||||
</ant:doclet>
|
||||
</ant:javadoc>
|
||||
|
||||
<javadoc
|
||||
<ant:javadoc
|
||||
packagenames="${pom.package}.*"
|
||||
sourcepath="${maven.jdiff.new.src}">
|
||||
|
||||
<doclet name="jdiff.JDiff"
|
||||
<ant:doclet name="jdiff.JDiff"
|
||||
path="${maven.cp}">
|
||||
<param name="-apiname" value="${maven.jdiff.new.tag}"/>
|
||||
<param name="-baseURI" value="${baseuri}"/>
|
||||
</doclet>
|
||||
</javadoc>
|
||||
<ant:param name="-apiname" value="${maven.jdiff.new.tag}"/>
|
||||
<ant:param name="-baseURI" value="${baseuri}"/>
|
||||
</ant:doclet>
|
||||
</ant:javadoc>
|
||||
|
||||
<javadoc
|
||||
<ant:javadoc
|
||||
private="yes"
|
||||
destdir="${maven.jdiff.changes.dir}"
|
||||
packagenames="${pom.package}.*"
|
||||
sourcepath="${maven.jdiff.new.src}"
|
||||
>
|
||||
|
||||
<doclet name="jdiff.JDiff" path="${maven.cp}">
|
||||
<param name="-stats"/>
|
||||
<param name="-oldapi" value="${maven.jdiff.old.tag}"/>
|
||||
<param name="-newapi" value="${maven.jdiff.new.tag}"/>
|
||||
<param name="-javadocnew" value="${javadocDestdir}/"/>
|
||||
</doclet>
|
||||
<ant:doclet name="jdiff.JDiff" path="${maven.cp}">
|
||||
<ant:param name="-stats"/>
|
||||
<ant:param name="-oldapi" value="${maven.jdiff.old.tag}"/>
|
||||
<ant:param name="-newapi" value="${maven.jdiff.new.tag}"/>
|
||||
<ant:param name="-javadocnew" value="${javadocDestdir}/"/>
|
||||
</ant:doclet>
|
||||
|
||||
</javadoc>
|
||||
</ant:javadoc>
|
||||
|
||||
<copy todir="${maven.jdiff.changes.dir}">
|
||||
<fileset dir="${maven.home}/plugins/jdiff-maven-plugin-1.0">
|
||||
<include name="*.gif"/>
|
||||
</fileset>
|
||||
</copy>
|
||||
<ant:copy todir="${maven.jdiff.changes.dir}">
|
||||
<ant:fileset dir="${maven.home}/plugins/jdiff-maven-plugin-1.0">
|
||||
<ant:include name="*.gif"/>
|
||||
</ant:fileset>
|
||||
</ant:copy>
|
||||
|
||||
</goal>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user