- Only register/deregister the FAQ reports if there are <code>.fml</code> files present in the project.

- Use default reports
- Fixed <versions> element location
- Added <version> element for HEAD dev


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115167 13f79535-47bb-0310-9956-ffa450edef68

faq/plugin.jelly

@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+
 <!-- 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -17,7 +18,6 @@
  */
  -->
 
-
 <project
   xmlns:j="jelly:core"
   xmlns:util="jelly:util"
@@ -144,16 +144,34 @@
 
   </define:taglib>
 
-  <goal name="maven-faq-plugin:register">
-    <doc:registerReport
-      name="FAQs"
-      pluginName="maven-faq-plugin"
-      description="Frequently Asked Questions."
-      link="faq"/>
+  <goal name="faq:init">
+
+    <fileScanner var="fmlFiles">
+      <fileset dir="${maven.faq.src}" includes="**/*.fml"/>
+    </fileScanner>
+
   </goal>
 
-  <goal name="maven-faq-plugin:deregister">
-    <doc:deregisterReport name="FAQs"/>
+  <goal name="maven-faq-plugin:register" prereqs="faq:init">
+
+    <!-- Only register the faq report if there are some fml files in
+         the project -->
+    <j:if test="${fmlFiles.iterator().hasNext()}">
+      <doc:registerReport
+        name="FAQs"
+        pluginName="maven-faq-plugin"
+        description="Frequently Asked Questions."
+        link="faq"/>    
+    </j:if>
+         
+  </goal>
+
+  <goal name="maven-faq-plugin:deregister" prereqs="faq:init">
+    <!-- Only deregister the faq report if there are some fml files in
+         the project -->
+    <j:if test="${fmlFiles.iterator().hasNext()}">
+      <doc:deregisterReport name="FAQs"/>
+    </j:if>
   </goal>
 
   <goal name="maven-faq-plugin:report" 

faq/project.xml

@@ -19,13 +19,11 @@
  -->
 
 <project>
-  <extend>../project.xml</extend>
+  <extend>../plugin-parent/project.xml</extend>
   <pomVersion>3</pomVersion>
   <id>maven-faq-plugin</id>
   <name>Maven FAQ Plug-in</name>
   <currentVersion>1.3-SNAPSHOT</currentVersion>
-  <!-- Gump integration -->
-
   <gumpRepositoryId>jakarta</gumpRepositoryId>
   <description>Creates XDoc documentation from an FAQ XML document.</description>
   <shortDescription>FAQ Plugin</shortDescription>
@@ -37,6 +35,18 @@
     <developerConnection>scm:cvs:ext:${maven.username}@cvs.apache.org:/home/cvs:maven-plugins/faq/</developerConnection>
     <url>http://cvs.apache.org/viewcvs/maven-plugins/faq</url>
   </repository>
+  <versions>
+    <version>
+      <id>1.2</id>
+      <name>1.2</name>
+      <tag>MAVEN_FAQ_1_2</tag>
+    </version>
+    <version>
+      <id>1.3</id>
+      <name>1.3</name>
+      <tag>HEAD</tag>
+    </version>
+  </versions>
   <developers>
     <developer>
       <name>James Strachan</name>
@@ -56,6 +66,15 @@
         <role>Java Developer</role>
       </roles>
     </developer>
+    <developer>
+      <name>Vincent Massol</name>
+      <id>vmassol</id>
+      <email>vmassol@pivolis.com</email>
+      <organization>Pivolis</organization>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
   </developers>
   <dependencies>
     <dependency>
@@ -65,7 +84,6 @@
       <url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
     </dependency>
     <!-- core dependencies which i'd have thought Maven introduced -->
-
     <dependency>
       <groupId>dom4j</groupId>
       <artifactId>dom4j</artifactId>
@@ -85,21 +103,4 @@
       <url>http://xml.apache.org/xerces2-j/</url>
     </dependency>
   </dependencies>
-  <reports>
-    <report>maven-changelog-plugin</report>
-    <report>maven-changes-plugin</report>
-    <report>maven-developer-activity-plugin</report>
-    <report>maven-file-activity-plugin</report>
-    <report>maven-license-plugin</report>
-    <report>maven-linkcheck-plugin</report>
-    <report>maven-tasklist-plugin</report>
-    <report>maven-faq-plugin</report>
-  </reports>
-  <versions>
-    <version>
-      <id>1.2</id>
-      <name>1.2</name>
-      <tag>MAVEN_FAQ_1_2</tag>
-    </version>
-  </versions>
 </project>

faq/xdocs/changes.xml

@@ -25,9 +25,12 @@
   </properties>
   <body>
     <release version="1.3-SNAPSHOT" date="in CVS">
+      <action dev="vmassol" type="update">
+        Only register/deregister the FAQ reports if there are 
+        <code>.fml</code> files present in the project.
+      </action>
       <action dev="brett" type="fix" issue="MPFAQ-8">Escape anchor tags and references so spaces can be used in id</action>
     </release>
-
     <release version="1.2" date="2004-03-10">
       <action dev="epugh" type="fix">Only run when an xdocs directory exists.</action>
       <action dev="dion" type="fix" issue="MAVEN-973">Fix MAVEN-973. xdocs source hardcoded.</action>