From 18cef293c86410d9c625caea8ad886e897d94df1 Mon Sep 17 00:00:00 2001
From: dion <dion@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 19 Jul 2004 03:00:36 +0000
Subject: [PATCH] Fix MPDEVACTIVITY-1

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115856 13f79535-47bb-0310-9956-ffa450edef68
---
 developer-activity/plugin.jelly               |  4 ++--
 developer-activity/plugin.properties          |  1 -
 developer-activity/project.xml                | 20 +++++++++++++++++++
 .../plugin-resources/developer-activity.jsl   |  2 +-
 developer-activity/xdocs/changes.xml          |  1 +
 file-activity/plugin.jelly                    |  5 +++--
 file-activity/plugin.properties               |  3 ---
 file-activity/project.xml                     | 20 +++++++++++++++++++
 .../maven-file-activity-plugin.jsl            |  2 +-
 file-activity/xdocs/changes.xml               |  1 +
 10 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/developer-activity/plugin.jelly b/developer-activity/plugin.jelly
index 8e789d36..f1ec4a31 100644
--- a/developer-activity/plugin.jelly
+++ b/developer-activity/plugin.jelly
@@ -75,7 +75,7 @@
           <util:available file="${maven.build.dir}/changelog.xml">
             <j:set var="changelogPresent" value="true"/>
           </util:available>
-          
+          <maven:get var="maven.changelog.range" plugin="maven-changelog-plugin" property="maven.changelog.range"/>
           <j:if test="${changelogPresent != 'true'}">
             <changelog:changelog
               basedir="${maven.changelog.basedir}"
@@ -83,7 +83,7 @@
               factory="${factory}"
               output="${maven.build.dir}/changelog.xml"
               outputEncoding="${maven.docs.outputencoding}"
-              range="${maven.activitylog.range}"
+              range="${maven.changelog.range}"
               repositoryConnection="${_connection}"
               dateFormat="${maven.changelog.dateformat}"
             />
diff --git a/developer-activity/plugin.properties b/developer-activity/plugin.properties
index 7b50ce1d..61e212fc 100644
--- a/developer-activity/plugin.properties
+++ b/developer-activity/plugin.properties
@@ -18,4 +18,3 @@
 # P L U G I N  P R O P E R I E S
 # -------------------------------------------------------------------
 maven.changelog.basedir=${basedir}
-maven.activitylog.range = 30
diff --git a/developer-activity/project.xml b/developer-activity/project.xml
index 8b5564a5..78ef8259 100644
--- a/developer-activity/project.xml
+++ b/developer-activity/project.xml
@@ -47,6 +47,26 @@
     </version>
   </versions>
   <developers>
+    <developer>
+      <name>dIon Gillard</name>
+      <id>dion</id>
+      <email>dion@apache.org</email>
+      <organization>ASF</organization>
+      <roles>
+        <role>Documentation</role>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <name>Brett Porter</name>
+      <id>brett</id>
+      <email>brett@apache.org</email>
+      <organization>ASF</organization>
+      <roles>
+        <role>Documentation</role>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
     <developer>
       <name>Emmanuel Venisse</name>
       <id>evenisse</id>
diff --git a/developer-activity/src/plugin-resources/developer-activity.jsl b/developer-activity/src/plugin-resources/developer-activity.jsl
index 7b73c090..2c1237a3 100644
--- a/developer-activity/src/plugin-resources/developer-activity.jsl
+++ b/developer-activity/src/plugin-resources/developer-activity.jsl
@@ -37,7 +37,7 @@
         <section name="Activity by Developer">
           <p>
             <!-- The range needs to be fed in somehow. -->
-            Timeframe: ${maven.activitylog.range} days,
+            Timeframe: ${maven.changelog.range} days,
             Total Commits:
             <x:expr select="count(./changelog-entry)"/>
             Total Number of Files Changed:
diff --git a/developer-activity/xdocs/changes.xml b/developer-activity/xdocs/changes.xml
index d01d5311..bc1a0ffd 100644
--- a/developer-activity/xdocs/changes.xml
+++ b/developer-activity/xdocs/changes.xml
@@ -25,6 +25,7 @@
   </properties>
   <body>
     <release version="1.5.1-SNAPSHOT" date="in CVS">
+      <action dev="dion" type="fix" issue="MPDEVACTIVITY-1">Use maven.changelog.range instead of maven.activity.range.</action>
       <action dev="dion" type="update">Bump jelly xml tag dependency.</action>
     </release>
     <release version="1.5" date="2004-05-15"></release>
diff --git a/file-activity/plugin.jelly b/file-activity/plugin.jelly
index bd353457..6829f85f 100644
--- a/file-activity/plugin.jelly
+++ b/file-activity/plugin.jelly
@@ -84,7 +84,8 @@
           <util:available file="${maven.build.dir}/changelog.xml">
             <j:set var="changelogPresent" value="true"/>
           </util:available>
-          
+
+          <maven:get var="maven.changelog.range" plugin="maven-changelog-plugin" property="maven.changelog.range"/>
           <j:if test="${changelogPresent != 'true'}">
             <changelog:changelog
               basedir="${maven.changelog.basedir}"
@@ -92,7 +93,7 @@
               factory="${factory}"
               output="${maven.build.dir}/changelog.xml"
               outputEncoding="${maven.docs.outputencoding}"
-              range="${maven.activitylog.range}"
+              range="${maven.changelog.range}"
               repositoryConnection="${_connection}"
               dateFormat="${maven.changelog.dateformat}"
             />
diff --git a/file-activity/plugin.properties b/file-activity/plugin.properties
index bcee7f00..61e212fc 100644
--- a/file-activity/plugin.properties
+++ b/file-activity/plugin.properties
@@ -18,6 +18,3 @@
 # P L U G I N  P R O P E R I E S
 # -------------------------------------------------------------------
 maven.changelog.basedir=${basedir}
-
-# vmassol: Shouldn't this be deleted?
-maven.activitylog.range = 30
diff --git a/file-activity/project.xml b/file-activity/project.xml
index 9e748658..bf24df88 100644
--- a/file-activity/project.xml
+++ b/file-activity/project.xml
@@ -48,6 +48,16 @@
     </version>
   </versions>
   <developers>
+    <developer>
+      <name>dIon Gillard</name>
+      <id>dion</id>
+      <email>dion@apache.org</email>
+      <organization>ASF</organization>
+      <roles>
+        <role>Documentation</role>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
     <developer>
       <name>Pete Kazmier</name>
       <id>kaz</id>
@@ -58,6 +68,16 @@
         <role>Java Developer</role>
       </roles>
     </developer>
+    <developer>
+      <name>Brett Porter</name>
+      <id>brett</id>
+      <email>brett@apache.org</email>
+      <organization>ASF</organization>
+      <roles>
+        <role>Documentation</role>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
     <developer>
       <name>Emmanuel Venisse</name>
       <id>evenisse</id>
diff --git a/file-activity/src/plugin-resources/maven-file-activity-plugin.jsl b/file-activity/src/plugin-resources/maven-file-activity-plugin.jsl
index 8fcdf862..30083c5d 100644
--- a/file-activity/src/plugin-resources/maven-file-activity-plugin.jsl
+++ b/file-activity/src/plugin-resources/maven-file-activity-plugin.jsl
@@ -38,7 +38,7 @@
       <body>
         <section name="Activity by File">
           <p>
-            Timeframe: ${maven.activitylog.range} days,
+            Timeframe: ${maven.changelog.range} days,
             Total Commits:
             <x:expr select="count(./changelog-entry)"/>
             Total Number of Files Changed:
diff --git a/file-activity/xdocs/changes.xml b/file-activity/xdocs/changes.xml
index cf7b671e..3df8253d 100644
--- a/file-activity/xdocs/changes.xml
+++ b/file-activity/xdocs/changes.xml
@@ -25,6 +25,7 @@
   </properties>
   <body>
     <release version="1.5.1-SNAPSHOT" date="in CVS">
+      <action dev="dion" type="fix" issue="MPDEVACTIVITY-1">Use maven.changelog.range instead of maven.activity.range.</action>
     </release>
     <release version="1.5" date="2004-05-15"></release>
     <release version="1.4" date="2004-03-07">