bwalding 2003/07/23 03:25:18
Modified: src/plugins-build/xdoc plugin.jelly
src/plugins-build/xdoc/src/plugin-resources site.jsl
Log:
Completed updates. Much much cleaner. Could still do to remove the temporary file
generation.
PR: MAVEN-602
Revision Changes Path
1.36 +1 -3 maven/src/plugins-build/xdoc/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/xdoc/plugin.jelly,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- plugin.jelly 23 Jul 2003 10:06:41 -0000 1.35
+++ plugin.jelly 23 Jul 2003 10:25:17 -0000 1.36
@@ -326,9 +326,7 @@
</j:file>
<x:parse var="projectNavRoot" xml="${tempnav}"/>
- <echo>HASHISH ${size(projectNavRoot)} -
${projectNavRoot.getClass().getName()}</echo>
-
- <x:set var="projectNav" select="$projectNavRoot/project"/>
+ <x:set var="projectNav" select="$projectNavRoot/project"/>
<j:file name="${outFile}" encoding="${outputencoding}"
1.31 +0 -134 maven/src/plugins-build/xdoc/src/plugin-resources/site.jsl
Index: site.jsl
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/xdoc/src/plugin-resources/site.jsl,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- site.jsl 23 Jul 2003 10:06:41 -0000 1.30
+++ site.jsl 23 Jul 2003 10:25:18 -0000 1.31
@@ -171,140 +171,6 @@
<!-- Standard Maven Navigation -->
<j:set var="fileName">${file}</j:set>
- <!--
- ! Check to see if the user wishes to include the
- ! maven-generated docs on their site.
- !-->
- <j:if test="${includeProjectDocumentation.equals('yes')}">
- <div>
- <strong>Project Documentation</strong>
- <div>
- <small>
- <a href="${relativePath}/index.html">About ${pom.name}</a>
- </small>
- </div>
- <div>
- <small>
- <a href="${relativePath}/project-info.html">Project Info</a>
- </small>
- <util:tokenize var="projectInfoFiles"
delim=",">${maven.xdoc.projectInfo}</util:tokenize>
- <j:forEach var="infoFile" items="${projectInfoFiles}">
- <j:if test="${relativePath == '.' and
fileName.endsWith(infoFile)}">
- <div>
- <small>
- <a href="${relativePath}/mail-lists.html">Mailing
Lists</a>
- </small>
- </div>
- <div>
- <small>
- <a href="${relativePath}/team-list.html">Project
Team</a>
- </small>
- </div>
- <div>
- <small>
- <a
href="${relativePath}/dependencies.html">Dependencies</a>
- </small>
- </div>
- <j:if test="${!empty(pom.repository.url)}">
- <div>
- <small>
- <a href="${relativePath}/cvs-usage.html">Source
Repository</a>
- </small>
- </div>
- </j:if>
- <j:if test="${!empty(pom.issueTrackingUrl)}">
- <div>
- <small>
- <a href="${relativePath}/issue-tracking.html">Issue
Tracking</a>
- </small>
- </div>
- </j:if>
- </j:if>
- </j:forEach>
- </div>
- <div>
- <small>
- <a href="${relativePath}/maven-reports.html">Project
Reports</a>
- </small>
-
- <!--
- | Check to see if we need to include the report
- | links in this document. The only time we
- | need to do this is when the current document
- | either the maven-reports.xml doc (the page
- | is displayed when clicking on Project
- | Reports) or when the current document is one
- | of the actual reports (in which case we want
- | to leave the project report links expanded.
- |-->
- <j:set var="includeReportLinks" value="false"/>
- <j:forEach var="report" items="${reports}">
- <j:set var="linkWithXmlExt" value="${report.link}.xml"/>
- <j:if test="${relativePath == '.' and
(fileName.endsWith('maven-reports.xml') or fileName.endsWith(linkWithXmlExt))}">
- <j:set var="includeReportLinks" value="true"/>
- </j:if>
- </j:forEach>
-
- <!--
- | If we need to include the report links, then
- | do so. This is determined by the above
- | block.
- |-->
- <j:if test="${includeReportLinks == 'true'}">
- <j:forEach var="report" items="${reports}">
- <div>
- <small>
- <a href="${relativePath}/${report.link}.html">
- ${report.name}
- </a>
- </small>
- </div>
- </j:forEach>
- </j:if>
- </div>
- <j:if test="${pom.reports.isEmpty()}">
- <j:if test="${sourcesPresent}">
- <div>
- <small>
- <a href="${relativePath}/apidocs/index.html">JavaDocs</a>
- </small>
- </div>
- <div>
- <small>
- <a href="${relativePath}/xref/index.html">Source
XReference</a>
- </small>
- </div>
- <j:if test="${unitTestSourcesPresent == 'true'}">
- <div>
- <small>
- <a href="${relativePath}/xref-test/index.html">Test
XReference</a>
- </small>
- </div>
- </j:if>
- </j:if>
- </j:if>
- <j:set var="devProcess" value="false"/>
- <util:available file="${maven.docs.src}/development-process.xml">
- <j:set var="devProcess" value="true"/>
- </util:available>
- <j:if test="${devProcess}">
- <div>
- <small>
- <a
href="${relativePath}/development-process.html">Development Process</a>
- </small>
- </div>
- </j:if>
- <j:if test="${!devProcess}">
- <div>
- <small>
- <j:set
var="devProcess">${maven.xdoc.developmentProcessUrl}</j:set>
- <a href="${devProcess}">Development Process</a>
- </small>
- </div>
- </j:if>
- </div>
- </j:if>
-
<j:set var="poweredbyimage">${maven.xdoc.poweredby.image}</j:set>
<j:set var="poweredbytitle">${maven.xdoc.poweredby.title}</j:set>
<j:set var="poweredbyurl">${maven.xdoc.poweredby.url}</j:set>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
