Author: aheritier
Date: Sat Sep 3 14:25:38 2005
New Revision: 267498
URL: http://svn.apache.org/viewcvs?rev=267498&view=rev
Log:
MPFAQ-11 : Questions' font is same size or smaller than answers' one. Xdoc
plugin > 1.9.2 required.
Patch submitted by : Lukas Theussl
Patch reviewed by : Arnaud Heritier
Modified:
maven/maven-1/plugins/trunk/faq/plugin.jelly
maven/maven-1/plugins/trunk/faq/project.xml
maven/maven-1/plugins/trunk/faq/src/plugin-resources/faq.jsl
maven/maven-1/plugins/trunk/faq/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/faq/plugin.jelly
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/faq/plugin.jelly?rev=267498&r1=267497&r2=267498&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/faq/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/faq/plugin.jelly Sat Sep 3 14:25:38 2005
@@ -20,12 +20,26 @@
<project
xmlns:j="jelly:core"
+ xmlns:maven="jelly:maven"
xmlns:util="jelly:util"
xmlns:x="jelly:xml"
xmlns:ant="jelly:ant"
xmlns:define="jelly:define"
xmlns:doc="doc"
xmlns:faq="faq">
+
+ <j:if test="${bootstrapping == null}">
+ <!-- Poor mans version check - plugin dependencies still suck for multiple
versions -->
+ <maven:get plugin="maven-xdoc-plugin" property="plugin" var="xdocPlugin" />
+ <j:if test="${empty(xdocPlugin) or
xdocPlugin.currentVersion.compareTo('1.9.2') lt 0}">
+ <ant:fail>
+ Must have XDOC plugin v1.9.2 installed to use this version of the faq
plugin.
+ Try: maven plugin:download -DgroupId=maven
-DartifactId=maven-xdoc-plugin -Dversion=1.9.2
+ You can find the latest version of the XDOC plugin on the Maven
Download page at
+ http://maven.apache.org/start/download.html
+ </ant:fail>
+ </j:if>
+ </j:if>
<define:taglib uri="faq">
Modified: maven/maven-1/plugins/trunk/faq/project.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/faq/project.xml?rev=267498&r1=267497&r2=267498&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/faq/project.xml (original)
+++ maven/maven-1/plugins/trunk/faq/project.xml Sat Sep 3 14:25:38 2005
@@ -80,6 +80,16 @@
<role>Java Developer</role>
</roles>
</developer>
+ <developer>
+ <name>Arnaud Heritier</name>
+ <id>aheritier</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>Octo Technology</organization>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ <timezone>+1</timezone>
+ </developer>
</developers>
<dependencies>
<dependency>
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=267498&r1=267497&r2=267498&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 Sep 3
14:25:38 2005
@@ -72,7 +72,7 @@
</jsl:template>
<jsl:template match="question">
- <dt>
+ <dt class="question">
<j:set var="_id"><x:expr select="../@id"/></j:set>
<j:set var="_id"><doc:escapeNameToken value="${_id}"/></j:set>
<a name="${_id}">
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=267498&r1=267497&r2=267498&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/faq/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/faq/xdocs/changes.xml Sat Sep 3 14:25:38 2005
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,7 +16,6 @@
* limitations under the License.
*/
-->
-
<document>
<properties>
<title>Changes</title>
@@ -25,6 +23,7 @@
</properties>
<body>
<release version="1.4.1-SNAPSHOT" date="in CVS">
+ <action dev="aheritier" type="update" issue="MPFAQ-11" due-to="Lukas
Theussl">Questions' font is same size or smaller than answers' one. Xdoc plugin
> 1.9.2 required.</action>
<action dev="dion" type="update" issue="MPFAQ-14" due-to="florent
ramiere">Document .fml extension requirement</action>
</release>
<release version="1.4" date="2004-06-25">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
