You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2005/10/30 06:33:30 UTC
svn commit: r329522 - in /maven/maven-1/plugins/trunk/faq: maven.xml
plugin.jelly plugin.properties src/plugin-resources/faq.jsl
src/plugin-resources/xsd/faq.xsd xdocs/changes.xml xdocs/faq.fml
xdocs/index.xml xdocs/properties.xml
Author: ltheussl
Date: Sat Oct 29 22:33:27 2005
New Revision: 329522
URL: http://svn.apache.org/viewcvs?rev=329522&view=rev
Log:
Replace maven.faq.toplinks property by toplink attribute in the fml file (m1 - m2 compatibility)
Modified:
maven/maven-1/plugins/trunk/faq/maven.xml
maven/maven-1/plugins/trunk/faq/plugin.jelly
maven/maven-1/plugins/trunk/faq/plugin.properties
maven/maven-1/plugins/trunk/faq/src/plugin-resources/faq.jsl
maven/maven-1/plugins/trunk/faq/src/plugin-resources/xsd/faq.xsd
maven/maven-1/plugins/trunk/faq/xdocs/changes.xml
maven/maven-1/plugins/trunk/faq/xdocs/faq.fml
maven/maven-1/plugins/trunk/faq/xdocs/index.xml
maven/maven-1/plugins/trunk/faq/xdocs/properties.xml
Modified: maven/maven-1/plugins/trunk/faq/maven.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/faq/maven.xml?rev=329522&r1=329521&r2=329522&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/faq/maven.xml (original)
+++ maven/maven-1/plugins/trunk/faq/maven.xml Sat Oct 29 22:33:27 2005
@@ -22,6 +22,9 @@
<fileset dir="${maven.docs.src}">
<include name="**/*.fml"/>
</fileset>
+ <fileset dir="${basedir}/src/plugin-resources/xsd">
+ <include name="faq.xsd"/>
+ </fileset>
</copy>
</postGoal>
</project>
Modified: maven/maven-1/plugins/trunk/faq/plugin.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/faq/plugin.jelly?rev=329522&r1=329521&r2=329522&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/faq/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/faq/plugin.jelly Sat Oct 29 22:33:27 2005
@@ -88,6 +88,9 @@
<j:set var="outFile" value="${mapper.mapFileName(outFileForward).0}"/>
<echo>Generating ${outFile} from ${faqFile}</echo>
+ <j:if test="${maven.faq.toplinks == 'true'}">
+ <echo>WARNING: the property maven.faq.toplinks is depreated! Use the 'toplink' attribute in your fml file instead.</echo>
+ </j:if>
<!-- produce a output xdoc xml file from parsed .fml source -->
<doc:jslFile
Modified: maven/maven-1/plugins/trunk/faq/plugin.properties
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/faq/plugin.properties?rev=329522&r1=329521&r2=329522&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/faq/plugin.properties (original)
+++ maven/maven-1/plugins/trunk/faq/plugin.properties Sat Oct 29 22:33:27 2005
@@ -23,6 +23,3 @@
# Destination directory where output xdocs file are produced
maven.faq.dest=${maven.gen.docs}
-
-# Whether to generate links to the top of the page
-maven.faq.toplinks=true
Modified: maven/maven-1/plugins/trunk/faq/src/plugin-resources/faq.jsl
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/faq/src/plugin-resources/faq.jsl?rev=329522&r1=329521&r2=329522&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/faq/src/plugin-resources/faq.jsl (original)
+++ maven/maven-1/plugins/trunk/faq/src/plugin-resources/faq.jsl Sat Oct 29 22:33:27 2005
@@ -29,6 +29,7 @@
trim="true">
<jsl:template match="faqs" trim="false">
<j:set var="title"><x:expr select="@title" /></j:set>
+ <j:set var="toplinks"><x:expr select="@toplink" /></j:set>
<document>
<properties>
<title>${title}</title>
@@ -81,11 +82,11 @@
<jsl:template match="answer">
<dd>
<jsl:applyTemplates trim="true" />
- <j:if test="${context.getVariable('maven.faq.toplinks') == 'true'}">
- <j:set var="top"><x:expr select="../../../@title"/></j:set>
- <j:set var="_top">#<doc:escapeNameToken value="${top}"/></j:set>
- <div class="xright"><a href="${_top}">[top]</a></div>
- <br/>
+ <j:if test="${toplinks != 'false'}">
+ <j:set var="top"><x:expr select="../../../@title"/></j:set>
+ <j:set var="_top">#<doc:escapeNameToken value="${top}"/></j:set>
+ <div class="xright"><a href="${_top}">[top]</a></div>
+ <br/>
</j:if>
</dd>
</jsl:template>
Modified: maven/maven-1/plugins/trunk/faq/src/plugin-resources/xsd/faq.xsd
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/faq/src/plugin-resources/xsd/faq.xsd?rev=329522&r1=329521&r2=329522&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/faq/src/plugin-resources/xsd/faq.xsd (original)
+++ maven/maven-1/plugins/trunk/faq/src/plugin-resources/xsd/faq.xsd Sat Oct 29 22:33:27 2005
@@ -58,6 +58,7 @@
<xsd:element ref="part" minOccurs="1" maxOccurs="unbounded"/>
</xsd:sequence>
<xsd:attribute name="title" type="xsd:string" use="optional"/>
+ <xsd:attribute name="toplink" type="xsd:string" use="optional"/>
</xsd:complexType>
</xsd:element>
Modified: maven/maven-1/plugins/trunk/faq/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/faq/xdocs/changes.xml?rev=329522&r1=329521&r2=329522&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/faq/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/faq/xdocs/changes.xml Sat Oct 29 22:33:27 2005
@@ -23,6 +23,7 @@
</properties>
<body>
<release version="1.6-SNAPSHOT" date="In SVN">
+ <action dev="ltheussl" type="update">Deprecated <code>maven.faq.toplinks</code> property. Use the <code>toplink</code> attribute in the fml file instead.</action>
<action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated :
<ul>
<li>commons-jelly-tags-xml v1.0 -> v1.1</li>
Modified: maven/maven-1/plugins/trunk/faq/xdocs/faq.fml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/faq/xdocs/faq.fml?rev=329522&r1=329521&r2=329522&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/faq/xdocs/faq.fml (original)
+++ maven/maven-1/plugins/trunk/faq/xdocs/faq.fml Sat Oct 29 22:33:27 2005
@@ -17,7 +17,7 @@
*/
-->
-<faqs title="Frequently Asked Questions">
+<faqs title="Frequently Asked Questions" toplink="false">
<part id="general">
<title>General</title>
@@ -57,4 +57,4 @@
</answer>
</faq>
</part>
-</faqs>
\ No newline at end of file
+</faqs>
Modified: maven/maven-1/plugins/trunk/faq/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/faq/xdocs/index.xml?rev=329522&r1=329521&r2=329522&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/faq/xdocs/index.xml (original)
+++ maven/maven-1/plugins/trunk/faq/xdocs/index.xml Sat Oct 29 22:33:27 2005
@@ -38,7 +38,7 @@
<a href="faq.xsd">here</a>.
</p>
<p>
- Please note that the the FAQ description has to be in a file with a
+ <strong>Note</strong>: the FAQ description has to be in a file with a
<code>.fml</code> extension.
</p>
<p>
Modified: maven/maven-1/plugins/trunk/faq/xdocs/properties.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/faq/xdocs/properties.xml?rev=329522&r1=329521&r2=329522&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/faq/xdocs/properties.xml (original)
+++ maven/maven-1/plugins/trunk/faq/xdocs/properties.xml Sat Oct 29 22:33:27 2005
@@ -48,9 +48,7 @@
<td>maven.faq.toplinks</td>
<td>Yes</td>
<td>
- Specifies whether links to the top of the page should be
- generated after each answer.
- Defaults to <code>true</code>.
+ <strong>DEPRECATED</strong>: use the <code>toplink</code> attribute in the fml file instead.
</td>
</tr>
</table>