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:
dion 2003-03-30 23:29:45 +00:00
parent bdc0947ab6
commit 26d891efe4
2 changed files with 94 additions and 95 deletions

View File

@ -11,120 +11,119 @@
<goal name="jdiff" prereqs="xdoc:init" <goal name="jdiff" prereqs="xdoc:init"
description="generate an api difference report between versions"> description="generate an api difference report between versions">
<property name="maven.jdiff.dir" value="${maven.build.dir}/jdiff"/> <ant:property name="maven.jdiff.dir" value="${maven.build.dir}/jdiff"/>
<mkdir dir="${maven.jdiff.dir}"/> <ant:mkdir dir="${maven.jdiff.dir}"/>
<j:set var="docsDest" <j:set var="docsDest"
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}"/> value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}"/>
<j:set var="javadocDestdir" <j:set var="javadocDestdir"
value="${pom.getPluginContext('maven-javadoc-plugin').getVariable('maven.javadoc.destdir')}"/> value="${pom.getPluginContext('maven-javadoc-plugin').getVariable('maven.javadoc.destdir')}"/>
<property name="maven.jdiff.changes.dir" value="${docsDest}/jdiff"/> <ant:property name="maven.jdiff.changes.dir" value="${docsDest}/jdiff"/>
<mkdir dir="${maven.jdiff.changes.dir}"/> <ant:mkdir dir="${maven.jdiff.changes.dir}"/>
<condition property="maven.jdiff.new.current" value="true"> <ant:condition property="maven.jdiff.new.current" value="true">
<equals arg1="${maven.jdiff.new.tag}" arg2="CURRENT"/> <ant:equals arg1="${maven.jdiff.new.tag}" arg2="CURRENT"/>
</condition> </ant:condition>
<condition property="maven.jdiff.old.current" value="true"> <ant:condition property="maven.jdiff.old.current" value="true">
<equals arg1="${maven.jdiff.old.tag}" arg2="CURRENT"/> <ant:equals arg1="${maven.jdiff.old.tag}" arg2="CURRENT"/>
</condition> </ant:condition>
<j:choose> <j:choose>
<j:when test="${maven.jdiff.new.current}"> <j:when test="${maven.jdiff.new.current}">
<ant:property name="maven.jdiff.new.src" value="${pom.build.SourceDirectory}"/>
</j:when>
<property name="maven.jdiff.new.src" value="${pom.build.SourceDirectory}"/> <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> <ant:cvs
<j:otherwise> cvsRoot="${pom.repository.cvsRoot}"
package="${pom.repository.cvsModule}/${maven.build.sourceDirectory}"
<property name="maven.jdiff.new.dir" value="${maven.jdiff.dir}/${maven.jdiff.new.tag}"/> dest="${maven.jdiff.new.dir}"
<mkdir dir="${maven.jdiff.new.dir}"/> tag="${maven.jdiff.new.tag}"
/>
<cvs <ant:property name="maven.jdiff.new.src"
cvsRoot="${pom.repository.cvsRoot}" value="${maven.jdiff.new.dir}/${pom.repository.cvsModule}/${pom.build.SourceDirectory}"/>
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}"/>
</j:otherwise> </j:otherwise>
</j:choose> </j:choose>
<j:choose> <j:choose>
<j:when test="${maven.jdiff.old.current}"> <j:when test="${maven.jdiff.old.current}">
<property name="maven.jdiff.old.src" value="${pom.build.SourceDirectory}"/> <ant:property name="maven.jdiff.old.src" value="${pom.build.SourceDirectory}"/>
</j:when>
<j:otherwise>
<ant:property name="maven.jdiff.old.dir"
value="${maven.jdiff.dir}/${maven.jdiff.old.tag}"/>
<ant:mkdir dir="${maven.jdiff.old.dir}"/>
<ant:cvs
cvsRoot="${pom.repository.cvsRoot}"
package="${pom.repository.cvsModule}/${maven.build.sourceDirectory}"
dest="${maven.jdiff.old.dir}"
tag="${maven.jdiff.old.tag}"
/>
<ant:property name="maven.jdiff.old.src"
value="${maven.jdiff.old.dir}/${pom.repository.cvsModule}/${pom.build.SourceDirectory}"/>
</j:otherwise>
</j:choose>
</j:when> <ant:property name="maven.cp.sub" refid="maven-classpath"/>
<j:otherwise> <ant:property name="maven.cp" value="${maven.cp.sub};${java.class.path}"/>
<property name="maven.jdiff.old.dir" value="${maven.jdiff.dir}/${maven.jdiff.old.tag}"/> <ant:property name="baseuri" value="${maven.home}/plugins/jdiff"/>
<mkdir dir="${maven.jdiff.old.dir}"/>
<cvs <ant:javadoc
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>
<property name="maven.cp.sub" refid="maven-classpath"/>
<property name="maven.cp" value="${maven.cp.sub};${java.class.path}"/>
<property name="baseuri" value="${maven.home}/plugins/jdiff"/>
<javadoc
sourcepath="${maven.jdiff.old.src}" sourcepath="${maven.jdiff.old.src}"
packagenames="${pom.package}.*" packagenames="${pom.package}.*"
> >
<doclet name="jdiff.JDiff" <ant:doclet name="jdiff.JDiff"
path="${maven.cp}"> path="${maven.cp}">
<param name="-apiname" value="${maven.jdiff.old.tag}"/> <ant:param name="-apiname" value="${maven.jdiff.old.tag}"/>
<param name="-baseURI" value="${baseuri}"/> <ant:param name="-baseURI" value="${baseuri}"/>
</doclet> </ant:doclet>
</javadoc> </ant:javadoc>
<javadoc <ant:javadoc
packagenames="${pom.package}.*" packagenames="${pom.package}.*"
sourcepath="${maven.jdiff.new.src}"> sourcepath="${maven.jdiff.new.src}">
<doclet name="jdiff.JDiff" <ant:doclet name="jdiff.JDiff"
path="${maven.cp}"> path="${maven.cp}">
<param name="-apiname" value="${maven.jdiff.new.tag}"/> <ant:param name="-apiname" value="${maven.jdiff.new.tag}"/>
<param name="-baseURI" value="${baseuri}"/> <ant:param name="-baseURI" value="${baseuri}"/>
</doclet> </ant:doclet>
</javadoc> </ant:javadoc>
<javadoc <ant:javadoc
private="yes" private="yes"
destdir="${maven.jdiff.changes.dir}" destdir="${maven.jdiff.changes.dir}"
packagenames="${pom.package}.*" packagenames="${pom.package}.*"
sourcepath="${maven.jdiff.new.src}" sourcepath="${maven.jdiff.new.src}"
> >
<doclet name="jdiff.JDiff" path="${maven.cp}"> <ant:doclet name="jdiff.JDiff" path="${maven.cp}">
<param name="-stats"/> <ant:param name="-stats"/>
<param name="-oldapi" value="${maven.jdiff.old.tag}"/> <ant:param name="-oldapi" value="${maven.jdiff.old.tag}"/>
<param name="-newapi" value="${maven.jdiff.new.tag}"/> <ant:param name="-newapi" value="${maven.jdiff.new.tag}"/>
<param name="-javadocnew" value="${javadocDestdir}/"/> <ant:param name="-javadocnew" value="${javadocDestdir}/"/>
</doclet> </ant:doclet>
</javadoc> </ant:javadoc>
<copy todir="${maven.jdiff.changes.dir}"> <ant:copy todir="${maven.jdiff.changes.dir}">
<fileset dir="${maven.home}/plugins/jdiff-maven-plugin-1.0"> <ant:fileset dir="${maven.home}/plugins/jdiff-maven-plugin-1.0">
<include name="*.gif"/> <ant:include name="*.gif"/>
</fileset> </ant:fileset>
</copy> </ant:copy>
</goal> </goal>

View File

@ -1,6 +1,7 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<project <project
xmlns:ant="jelly:ant"
xmlns:j="jelly:core" xmlns:j="jelly:core"
xmlns:doc="doc"> xmlns:doc="doc">
@ -26,7 +27,7 @@
<goal name="jellydoc" prereqs="jellydoc:doclet" <goal name="jellydoc" prereqs="jellydoc:doclet"
description="Generates the tag documentation"> description="Generates the tag documentation">
<mkdir dir="${genDocs}"/> <ant:mkdir dir="${genDocs}"/>
<j:file name="${genDocs}/tags.xml"> <j:file name="${genDocs}/tags.xml">
@ -51,35 +52,35 @@
<j:set var="maven.jellydoc.packages" value="${pom.package}.*"/> <j:set var="maven.jellydoc.packages" value="${pom.package}.*"/>
</j:if> </j:if>
<echo>Generating jellydoc for packages ${maven.jellydoc.packages}</echo> <ant:echo>Generating jellydoc for packages ${maven.jellydoc.packages}</ant:echo>
<mkdir dir="target"/> <ant:mkdir dir="target"/>
<echo>Source directory is ${basedir}/${pom.build.sourceDirectory}</echo> <ant:echo>Source directory is ${basedir}/${pom.build.sourceDirectory}</ant:echo>
<javadoc <ant:javadoc
sourcepath="${basedir}/${pom.build.sourceDirectory}" sourcepath="${basedir}/${pom.build.sourceDirectory}"
packagenames="${maven.jellydoc.packages}" packagenames="${maven.jellydoc.packages}"
classpathref="doclet.classpath" classpathref="doclet.classpath"
docletpathref="doclet.classpath" docletpathref="doclet.classpath"
doclet="org.apache.maven.jellydoc.TagXMLDoclet"> doclet="org.apache.maven.jellydoc.TagXMLDoclet">
</javadoc> </ant:javadoc>
<!-- if ran inside the reactor then lets copy the generated file --> <!-- if ran inside the reactor then lets copy the generated file -->
<copy tofile="${genDocs}/taglib.xml" file="${user.dir}/target/taglib.xml"/> <ant:copy tofile="${genDocs}/taglib.xml" file="${user.dir}/target/taglib.xml"/>
</goal> </goal>
<!-- runs the XML doclet --> <!-- runs the XML doclet -->
<goal name="jellydoc:xml-doclet" prereqs="jellydoc:init" <goal name="jellydoc:xml-doclet" prereqs="jellydoc:init"
description="Creates an XML representation of the doclet information"> description="Creates an XML representation of the doclet information">
<javadoc <ant:javadoc
sourcepath="${basedir}/${pom.build.sourceDirectory}" sourcepath="${basedir}/${pom.build.sourceDirectory}"
packagenames="${pom.package}.*" packagenames="${pom.package}.*"
classpathref="doclet.classpath" classpathref="doclet.classpath"
docletpathref="doclet.classpath" docletpathref="doclet.classpath"
doclet="org.apache.maven.jellydoc.XMLDoclet"> doclet="org.apache.maven.jellydoc.XMLDoclet">
</javadoc> </ant:javadoc>
</goal> </goal>
@ -91,19 +92,18 @@
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.gen.docs')}"/> value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.gen.docs')}"/>
<!-- just in case this is ran before a compile --> <!-- just in case this is ran before a compile -->
<mkdir dir="${genDocs}"/> <ant:mkdir dir="${genDocs}"/>
<path id="doclet.classpath"> <ant:path id="doclet.classpath">
<path refid="maven.dependency.classpath"/> <ant:path refid="maven.dependency.classpath"/>
<pathelement path="${plugin.dir}"/> <ant:pathelement path="${plugin.dir}"/>
<pathelement path="${plugin.getDependencyPath('javadoc')}"/> <ant:pathelement path="${plugin.getDependencyPath('javadoc')}"/>
<pathelement path="${plugin.getDependencyPath('nekohtml')}"/> <ant:pathelement path="${plugin.getDependencyPath('nekohtml')}"/>
<pathelement path="${plugin.getDependencyPath('dom4j')}"/> <ant:pathelement path="${plugin.getDependencyPath('dom4j')}"/>
<pathelement path="${plugin.getDependencyPath('xerces')}"/> <ant:pathelement path="${plugin.getDependencyPath('xerces')}"/>
<pathelement path="${plugin.getDependencyPath('xml-apis')}"/> <ant:pathelement path="${plugin.getDependencyPath('xml-apis')}"/>
<pathelement path="${plugin.getDependencyPath('commons-jelly')}"/> <ant:pathelement path="${plugin.getDependencyPath('commons-jelly')}"/>
</path> </ant:path>
</goal> </goal>
</project> </project>