Index: src/plugins-build/changes/plugin.jelly
===================================================================
RCS file: /home/cvspublic/maven/src/plugins-build/changes/plugin.jelly,v
retrieving revision 1.8
diff -u -r1.8 plugin.jelly
--- src/plugins-build/changes/plugin.jelly	11 Jul 2003 05:14:00 -0000	1.8
+++ src/plugins-build/changes/plugin.jelly	11 Jul 2003 14:17:03 -0000
@@ -1,49 +1,109 @@
 <?xml version="1.0"?>
 
-<project
-  xmlns:j="jelly:core"
-  xmlns:ant="jelly:ant"
-  xmlns:define="jelly:define"
-  xmlns:util="jelly:util"
-  xmlns:doc="doc">
+<project xmlns:j="jelly:core"
+         xmlns:ant="jelly:ant"
+         xmlns:util="jelly:util"
+         xmlns:doc="doc">
 
-  <goal name="maven-changes-plugin:register">
+  <goal name="maven-changes-plugin:init">
     <ant:property name="maven.docs.src"
       value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.src')}"/>
+    <ant:property name="maven.gen.docs"
+      value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.gen.docs')}"/>
+
+    <!-- configure xalan -->
+    ${systemScope.setProperty('javax.xml.transform.TransformerFactory',
+      'org.apache.xalan.processor.TransformerFactoryImpl')}
+  </goal>
+
+  <goal name="maven-changes-plugin:register" 
+        prereqs="maven-changes-plugin:init">
+
     <util:file var="changes" name="${maven.docs.src}/changes.xml"/>
     <j:if test="${changes.exists()}">
-      <doc:registerReport 
-        name="Changes" 
-        pluginName="changes"
-        link="changes-report"
-        description="Report on the project changes."/>
-     </j:if>
+      <doc:registerReport name="Changes" 
+                          pluginName="maven-changes-plugin"
+                          link="changes-report"
+                          description="Report on the project changes."/>
+    </j:if>
+
+    <util:file var="roadmap" name="${maven.docs.src}/roadmap.xml"/>
+    <j:if test="${roadmap.exists()}">
+      <doc:registerReport name="Roadmap" 
+                          pluginName="maven-changes-plugin"
+                          link="roadmap-report"
+                          description="Report on the project roadmap."/>
+    </j:if>
   </goal>
   
   <goal name="maven-changes-plugin:deregister">
     <doc:deregisterReport name="Changes"/>
+    <doc:deregisterReport name="Roadmap"/>
   </goal>
 
   <!-- ================================================================== -->
-  <!-- C H A N G E S  R E P O R T                                         -->
+  <!-- C H A N G E S  R E P O R T S                                       -->
   <!-- ================================================================== -->
 
-  <goal
-    name="changes:report"
-    description="Generate a changes report">
-  <j:set var="maven.docs.src"
-    value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.src')}"/>
-  <j:set var="maven.docs.outputencoding"
-    value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.outputencoding')}"/>
-
-  <doc:jsl
-        input="${maven.docs.src}/changes.xml"
-        output="changes-report.xml"
-        stylesheet="${plugin.resources}/changes.jsl"
-        encoding="${maven.docs.outputencoding}"
-        outputMode="xml"
-        prettyPrint="true"
-        />
-    
+  <goal name="maven-changes-plugin:report"
+        prereqs="maven-changes-plugin:init"
+        description="Generate a changes/roadmap report">
+
+    <attainGoal name="maven-changes-plugin:changes-report"/>
+    <attainGoal name="maven-changes-plugin:roadmap-report"/>
   </goal>
+
+  <goal name="maven-changes-plugin:changes-report">
+    <util:file var="changes" name="${maven.docs.src}/changes.xml"/>
+    <j:if test="${changes.exists()}">
+      <ant:style in="${maven.docs.src}/changes.xml" 
+                 style="${plugin.resources}/changes.xsl"
+                 out="${maven.gen.docs}/changes-report.xml">
+        
+        <ant:param name="include-type" 
+                   expression="${maven.changes.include.type}"/>
+        <ant:param name="include-desc" 
+                   expression="${maven.changes.include.desc}"/>
+        <ant:param name="include-dev" 
+                   expression="${maven.changes.include.dev}"/>
+        <ant:param name="include-status" 
+                   expression="${maven.changes.include.status}"/>
+        <ant:param name="header-type" 
+                   expression="${maven.changes.header.type}"/>
+        <ant:param name="header-desc" 
+                   expression="${maven.changes.header.desc}"/>
+        <ant:param name="header-dev" 
+                   expression="${maven.changes.header.dev}"/>
+        <ant:param name="header-status" 
+                   expression="${maven.changes.header.status}"/>
+      </ant:style>
+    </j:if>
+  </goal>
+
+  <goal name="maven-changes-plugin:roadmap-report">
+    <util:file var="roadmap" name="${maven.docs.src}/roadmap.xml"/>
+    <j:if test="${roadmap.exists()}">
+      <ant:style in="${maven.docs.src}/roadmap.xml" 
+                 style="${plugin.resources}/changes.xsl"
+                 out="${maven.gen.docs}/roadmap-report.xml">
+        <ant:param name="include-type" 
+                   expression="${maven.roadmap.include.type}"/>
+        <ant:param name="include-desc" 
+                   expression="${maven.roadmap.include.desc}"/>
+        <ant:param name="include-dev" 
+                   expression="${maven.roadmap.include.dev}"/>
+        <ant:param name="include-status" 
+                   expression="${maven.roadmap.include.status}"/>
+        <ant:param name="header-type" 
+                   expression="${maven.roadmap.header.type}"/>
+        <ant:param name="header-desc" 
+                   expression="${maven.roadmap.header.desc}"/>
+        <ant:param name="header-dev" 
+                   expression="${maven.roadmap.header.dev}"/>
+        <ant:param name="header-status" 
+                   expression="${maven.roadmap.header.status}"/>
+      </ant:style>
+    </j:if>
+  </goal>
+
 </project>
Index: src/plugins-build/changes/plugin.properties
===================================================================
RCS file: /home/cvspublic/maven/src/plugins-build/changes/plugin.properties,v
retrieving revision 1.2
diff -u -r1.2 plugin.properties
--- src/plugins-build/changes/plugin.properties	5 Jun 2003 20:34:13 -0000	1.2
+++ src/plugins-build/changes/plugin.properties	11 Jul 2003 14:17:15 -0000
@@ -1,5 +1,29 @@
 # -------------------------------------------------------------------
 # P L U G I N  P R O P E R I E S
 # -------------------------------------------------------------------
-# changes plugin.
+# Changes plugin.
 # -------------------------------------------------------------------
+
+# Columns to include in the changes report
+maven.changes.include.type=true
+maven.changes.include.desc=true
+maven.changes.include.dev=true
+maven.changes.include.status=false
+
+# Column headers for the changes report
+maven.changes.header.type=Type
+maven.changes.header.desc=Description
+maven.changes.header.dev=By
+maven.changes.header.status=Status
+
+# Columns to include in the roadmap report
+maven.roadmap.include.type=true
+maven.roadmap.include.desc=true
+maven.roadmap.include.dev=true
+maven.roadmap.include.status=true
+
+# Column headers for the roadmap report
+maven.roadmap.header.type=Type
+maven.roadmap.header.desc=Description
+maven.roadmap.header.dev=Assigned To
+maven.roadmap.header.status=Status
Index: src/plugins-build/xdoc/plugin.jelly
===================================================================
RCS file: /home/cvspublic/maven/src/plugins-build/xdoc/plugin.jelly,v
retrieving revision 1.31
diff -u -r1.31 plugin.jelly
--- src/plugins-build/xdoc/plugin.jelly	11 Jul 2003 05:15:25 -0000	1.31
+++ src/plugins-build/xdoc/plugin.jelly	11 Jul 2003 14:19:12 -0000
@@ -257,6 +257,7 @@
             <exclude name="**/template.xml"/>
             <exclude name="**/navigation.xml"/>
             <exclude name="changes.xml"/>
+            <exclude name="roadmap.xml"/>
             <include name="**/*.xml"/>
           </patternset>
         </fileset>