You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by di...@apache.org on 2003/01/19 13:07:24 UTC
cvs commit: jakarta-turbine-maven/src/plugins-build/javadoc plugin.jelly plugin.properties
dion 2003/01/19 04:07:24
Modified: src/plugins-build/javadoc plugin.jelly plugin.properties
Log:
Reinstate javadoc report
Revision Changes Path
1.14 +71 -67 jakarta-turbine-maven/src/plugins-build/javadoc/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/javadoc/plugin.jelly,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- plugin.jelly 14 Jan 2003 17:08:22 -0000 1.13
+++ plugin.jelly 19 Jan 2003 12:07:24 -0000 1.14
@@ -2,7 +2,8 @@
<project xmlns:j="jelly:core"
xmlns:util="jelly:util"
- xmlns:define="jelly:define">
+ xmlns:define="jelly:define"
+ xmlns:license="license">
<!-- ================================================================== -->
<!-- J A V A D O C S -->
@@ -17,78 +18,81 @@
<j:if test="${sourcesPresent == 'true'}">
- <mkdir dir="${maven.javadoc.destdir}"/>
- <mkdir dir="${maven.gen.docs}" />
+ <mkdir dir="${maven.javadoc.destdir}"/>
+ <mkdir dir="${maven.gen.docs}" />
- <!-- Get the year to display in the Javadocs -->
- <tstamp>
- <format property="year" pattern="${pom.inceptionYear}-yyyy"/>
- </tstamp>
-
- <property
- name="copyright"
- value="Copyright &copy; ${year} ${pom.organization.name}. All Rights Reserved."
- />
-
- <property
- name="title"
- value="${pom.name} ${pom.currentVersion} API"
- />
-
- <j:choose>
- <j:when test="${maven.mode.online}"/>
- <j:otherwise>
- <j:set var="maven.javadoc.links" value=""/>
- </j:otherwise>
- </j:choose>
-
- <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>
- </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" />
-
- <javadoc
- sourcepathref="maven.compile.src.set"
- packagenames="${pom.package}.*"
- destdir="${maven.javadoc.destdir}"
- author="${maven.javadoc.author}"
- private="${maven.javadoc.private}"
- version="${maven.javadoc.version}"
- use="${maven.javadoc.use}"
- windowtitle="${title}"
- doctitle="${title}"
- bottom="${copyright}"
- stylesheetfile="${maven.javadoc.stylesheet}">
-
- <j:if test="${context.getVariable('maven.javadoc.source') != null}">
- <setProperty name="source" value="${maven.javadoc.source}" />
- </j:if>
+ <!-- Get the year to display in the Javadocs -->
+ <tstamp>
+ <format property="year" pattern="${pom.inceptionYear}-yyyy"/>
+ </tstamp>
+
+ <property name="copyright"
+ value="Copyright &copy; ${year} ${pom.organization.name}. All Rights Reserved." />
+
+ <property name="title" value="${pom.name} ${pom.currentVersion} API"/>
+
+ <j:choose>
+ <j:when test="${maven.mode.online}"/>
+ <j:otherwise>
+ <j:set var="maven.javadoc.links" value=""/>
+ </j:otherwise>
+ </j:choose>
+
+ <util:tokenize var="links" delim="," trim="true">${maven.javadoc.links}</util:tokenize>
<j:forEach var="link" items="${links}">
- <link href="${link.trim()}"/>
+ <echo>Linking with API information from ${link.trim()} ...</echo>
</j:forEach>
- <classpath>
- <path refid="maven.dependency.classpath"/>
- <path location="${maven.build.dest}"/>
- </classpath>
-
- <j:if test="${maxMemory != null}">
- <setProperty name="maxmemory" value="${maven.javadoc.maxmemory}" />
- </j:if>
- <j:forEach var="packageGroup" items="${pom.packageGroups}">
- <group title="${packageGroup.title}" packages="${packageGroup.packages}"/>
- </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" />
+
+ <javadoc
+ sourcepathref="maven.compile.src.set"
+ packagenames="${pom.package}.*"
+ destdir="${maven.javadoc.destdir}"
+ author="${maven.javadoc.author}"
+ private="${maven.javadoc.private}"
+ version="${maven.javadoc.version}"
+ use="${maven.javadoc.use}"
+ windowtitle="${title}"
+ doctitle="${title}"
+ bottom="${copyright}"
+ stylesheetfile="${maven.javadoc.stylesheet}">
- </javadoc>
- <record name="${maven.build.dir}/javadoc/report.txt" action="stop" />
-
+ <j:if test="${context.getVariable('maven.javadoc.source') != null}">
+ <setProperty name="source" value="${maven.javadoc.source}" />
+ </j:if>
+
+ <j:forEach var="link" items="${links}">
+ <link href="${link.trim()}"/>
+ </j:forEach>
+ <classpath>
+ <path refid="maven.dependency.classpath"/>
+ <path location="${maven.build.dest}"/>
+ </classpath>
+
+ <j:if test="${maxMemory != null}">
+ <setProperty name="maxmemory" value="${maven.javadoc.maxmemory}" />
+ </j:if>
+
+ <j:forEach var="packageGroup" items="${pom.packageGroups}">
+ <group title="${packageGroup.title}" packages="${packageGroup.packages}"/>
+ </j:forEach>
+
+ </javadoc>
+ <record name="${maven.build.dir}/javadoc/report.txt" action="stop" />
+
+ <j:set var="genDocs" value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.gen.docs')}" />
+ <license:license
+ description="Javadoc Report"
+ input="${maven.build.dir}/javadoc/report.txt"
+ output="${genDocs}/javadoc.xml"
+ outputEncoding="${maven.docs.outputencoding}"
+ title="Javadoc"
+ />
</j:if>
</goal>
1.6 +0 -1 jakarta-turbine-maven/src/plugins-build/javadoc/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/javadoc/plugin.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plugin.properties 31 Dec 2002 07:17:01 -0000 1.5
+++ plugin.properties 19 Jan 2003 12:07:24 -0000 1.6
@@ -14,4 +14,3 @@
maven.javadoc.version = true
maven.docs.outputencoding = ISO-8859-1
-maven.gen.docs = ${maven.build.dest}/generated-xdocs