dion 2003/03/29 15:25:26
Modified: src/plugins-build/javadoc plugin.jelly
Log:
Explicity use ant name space. In prep for removal of jeez etc
Revision Changes Path
1.13 +32 -30 maven/src/plugins-build/javadoc/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/javadoc/plugin.jelly,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- plugin.jelly 21 Mar 2003 14:14:19 -0000 1.12
+++ plugin.jelly 29 Mar 2003 23:25:26 -0000 1.13
@@ -1,9 +1,11 @@
<?xml version="1.0"?>
-<project xmlns:j="jelly:core"
- xmlns:util="jelly:util"
+<project
+ xmlns:ant="jelly:ant"
xmlns:define="jelly:define"
- xmlns:doc="doc">
+ xmlns:doc="doc"
+ xmlns:j="jelly:core"
+ xmlns:util="jelly:util">
<goal name="maven-javadoc-plugin:register">
<j:if test="${sourcesPresent}">
@@ -39,27 +41,27 @@
<j:if test="${sourcesPresent == 'true'}">
- <mkdir dir="${maven.javadoc.destdir}"/>
+ <ant:mkdir dir="${maven.javadoc.destdir}"/>
<!-- Get the year to display in the Javadocs -->
- <tstamp>
- <format property="currentYear" pattern="yyyy"/>
- </tstamp>
- <tstamp>
+ <ant:tstamp>
+ <ant:format property="currentYear" pattern="yyyy"/>
+ </ant:tstamp>
+ <ant:tstamp>
<j:choose>
<j:when test="${pom.inceptionYear.equals(currentYear)}">
- <format property="year" pattern="yyyy"/>
+ <ant:format property="year" pattern="yyyy"/>
</j:when>
<j:otherwise>
- <format property="year" pattern="${pom.inceptionYear}-yyyy"/>
+ <ant:format property="year" pattern="${pom.inceptionYear}-yyyy"/>
</j:otherwise>
</j:choose>
- </tstamp>
+ </ant:tstamp>
- <property name="copyright"
+ <ant:property name="copyright"
value="Copyright &copy; ${year} ${pom.organization.name}. All Rights
Reserved." />
- <property name="title" value="${pom.name} ${pom.currentVersion} API"/>
+ <ant:property name="title" value="${pom.name} ${pom.currentVersion} API"/>
<j:choose>
<j:when test="${maven.mode.online}"/>
@@ -71,15 +73,15 @@
<util:tokenize var="links" delim=","
trim="true">${maven.javadoc.links}</util:tokenize>
<j:forEach var="link" items="${links}">
- <echo>Linking with API information from ${link.trim()} ...</echo>
+ <ant:echo>Linking with API information from ${link.trim()} ...</ant:echo>
</j:forEach>
<j:set var="maxMemory" value="${maven.javadoc.maxmemory}" />
- <mkdir dir="${maven.build.dir}/javadoc/" />
- <record name="${maven.build.dir}/javadoc/report.txt" action="start" />
+ <ant:mkdir dir="${maven.build.dir}/javadoc/" />
+ <ant:record name="${maven.build.dir}/javadoc/report.txt" action="start" />
- <javadoc
+ <ant:javadoc
sourcepathref="maven.compile.src.set"
packagenames="${pom.package}.*"
destdir="${maven.javadoc.destdir}"
@@ -96,31 +98,31 @@
additionalparam="${maven.javadoc.additionalparam}">
<j:if test="${context.getVariable('maven.javadoc.source') != null}">
- <setProperty name="source" value="${maven.javadoc.source}" />
+ <ant:setProperty name="source" value="${maven.javadoc.source}" />
</j:if>
<j:forEach var="link" items="${links}">
- <link href="${link.trim()}"/>
+ <ant:link href="${link.trim()}"/>
</j:forEach>
- <classpath>
- <path refid="maven.dependency.classpath"/>
- <path location="${maven.build.dest}"/>
- </classpath>
+ <ant:classpath>
+ <ant:path refid="maven.dependency.classpath"/>
+ <ant:path location="${maven.build.dest}"/>
+ </ant:classpath>
<j:if test="${maxMemory != null}">
- <setProperty name="maxmemory" value="${maven.javadoc.maxmemory}" />
+ <ant:setProperty name="maxmemory" value="${maven.javadoc.maxmemory}" />
</j:if>
<j:forEach var="packageGroup" items="${pom.packageGroups}">
- <group title="${packageGroup.title}"
packages="${packageGroup.packages}"/>
+ <ant:group title="${packageGroup.title}"
packages="${packageGroup.packages}"/>
</j:forEach>
<!-- allow custom doclets -->
<j:if test="${context.getVariable('maven.javadoc.doclet') != null}">
- <setProperty name="doclet" value="${maven.javadoc.doclet}" />
+ <ant:setProperty name="doclet" value="${maven.javadoc.doclet}" />
</j:if>
<j:if test="${context.getVariable('maven.javadoc.docletpath') != null}">
- <setProperty name="doclet" value="${maven.javadoc.docletpath}" />
+ <ant:setProperty name="doclet" value="${maven.javadoc.docletpath}" />
</j:if>
<!-- allow custom tags -->
@@ -134,12 +136,12 @@
<j:set var="enabled" value="${context.findVariable(enabledVar)}"/>
<j:set var="scopeVar" value="${someTag}.scope"/>
<j:set var="scope" value="${context.findVariable(scopeVar)}"/>
- <tag name="${name}" description="${description}"
+ <ant:tag name="${name}" description="${description}"
enabled="${enabled}" scope="${scope}"/>
</j:forEach>
- </javadoc>
- <record name="${maven.build.dir}/javadoc/report.txt" action="stop" />
+ </ant:javadoc>
+ <ant:record name="${maven.build.dir}/javadoc/report.txt" action="stop" />
<j:set var="genDocs"
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.gen.docs')}" />
<doc:text-xdoc
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
