dion 2003/10/16 22:31:38
Modified: src/plugins-build/xdoc/xdocs changes.xml
src/plugins-build/xdoc/src/plugin-resources site.jsl
Log:
Apply MAVEN-940.
Doesn't seem to have that much of an effect though.
Revision Changes Path
1.20 +3 -0 maven/src/plugins-build/xdoc/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/xdoc/xdocs/changes.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- changes.xml 8 Oct 2003 14:48:59 -0000 1.19
+++ changes.xml 17 Oct 2003 05:31:38 -0000 1.20
@@ -8,6 +8,9 @@
<body>
<release version="1.5" date="in CVS">
<action dev="dion" type="fix">
+ Apply MAVEN-940. Fix excess whitespace.
+ </action>
+ <action dev="dion" type="fix">
Fixed empty scm repository and issue tracking URL still being added
to the project nav
</action>
1.33 +10 -31 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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- site.jsl 23 Sep 2003 15:25:39 -0000 1.32
+++ site.jsl 17 Oct 2003 05:31:38 -0000 1.33
@@ -8,33 +8,22 @@
xmlns:util="jelly:util"
xmlns:x="jelly:xml"
xmlns:doc="doc"
- xmlns="dummy" trim="false">
+ xmlns="dummy"
+ trim="false">
<jsl:template match="document" trim="false">
<j:useBean var="navbean" class="org.apache.maven.NavBean"/>
<j:set var="location" value="${outFile.substring(destdir.length())}"/>
<util:replace var="location" oldChar="\" newChar="/" value="${location}"/>
-
<!-- Stores location for publish date / version -->
<j:set var="date">${maven.xdoc.date}</j:set>
-
- <j:setProperties
- object="${navbean}"
- document="${doc}"
- location="${location}"/>
+ <j:setProperties object="${navbean}" document="${doc}" location="${location}"/>
- <x:doctype name="html"
- publicId="-//W3C//DTD XHTML 1.0 Transitional//EN"
- systemId="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
-
+ <x:doctype name="html" publicId="-//W3C//DTD XHTML 1.0 Transitional//EN"
systemId="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
<html>
<head>
- <j:set var="docTitle">
- <x:expr select="./properties/title"/>
- </j:set>
+ <j:set var="docTitle"><x:expr select="./properties/title"/></j:set>
<x:if select="$nav/title">
- <title>
- <x:expr select="$nav/title"/> - ${docTitle}
- </title>
+ <title><x:expr select="$nav/title"/> - ${docTitle}</title>
</x:if>
<x:if select="not($nav/title)">
<title>${pom.name} - ${docTitle}</title>
@@ -488,25 +477,15 @@
</jsl:template>
<!-- remove the space at the end of parsed "a" anchors -->
- <jsl:template match="a" trim="false">
- <jsl:copy trim="true">
- <jsl:applyTemplates trim="true"/>
- </jsl:copy>
- </jsl:template>
-
+ <jsl:template match="a" trim="false"><jsl:copy trim="true"><jsl:applyTemplates
trim="true"/></jsl:copy></jsl:template>
+
<!-- copy any other elements through -->
- <jsl:template match="*" trim="false">
- <jsl:copy trim="false">
- <jsl:applyTemplates trim="false"/>
- </jsl:copy>
- </jsl:template>
+ <jsl:template match="*" trim="false"><jsl:copy trim="false"><jsl:applyTemplates
trim="false"/></jsl:copy></jsl:template>
<!-- element values don't pass through as text -->
<jsl:template match="@*"/>
<!-- CDATA and text nodes pass-thru -->
- <jsl:template match="text()">
- <x:expr select="."/>
- </jsl:template>
+ <jsl:template match="text()"><x:expr select="."/></jsl:template>
</jsl:stylesheet>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
