Fix MPDEVACTIVITY-1

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115856 13f79535-47bb-0310-9956-ffa450edef68
2004-07-19 03:00:36 +00:00
parent 7962517b46
commit 18cef293c8
10 changed files with 49 additions and 10 deletions
--- 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}"
            />
--- 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
--- 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>
--- 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:
--- 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>
--- 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}"
            />
--- 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
--- 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>
--- 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:
--- 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">