dion        2004/07/18 20:00:36

  Modified:    file-activity/xdocs changes.xml
               file-activity project.xml plugin.properties plugin.jelly
               developer-activity/xdocs changes.xml
               file-activity/src/plugin-resources
                        maven-file-activity-plugin.jsl
               developer-activity plugin.jelly project.xml
                        plugin.properties
               developer-activity/src/plugin-resources
                        developer-activity.jsl
  Log:
  Fix MPDEVACTIVITY-1
  
  Revision  Changes    Path
  1.12      +1 -0      maven-plugins/file-activity/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/file-activity/xdocs/changes.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- changes.xml       15 Jul 2004 00:12:19 -0000      1.11
  +++ changes.xml       19 Jul 2004 03:00:35 -0000      1.12
  @@ -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">
  
  
  
  1.32      +20 -0     maven-plugins/file-activity/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/file-activity/project.xml,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- project.xml       15 Jul 2004 00:12:19 -0000      1.31
  +++ project.xml       19 Jul 2004 03:00:35 -0000      1.32
  @@ -49,10 +49,30 @@
     </versions>
     <developers>
       <developer>
  +      <name>dIon Gillard</name>
  +      <id>dion</id>
  +      <email>[EMAIL PROTECTED]</email>
  +      <organization>ASF</organization>
  +      <roles>
  +        <role>Documentation</role>
  +        <role>Java Developer</role>
  +      </roles>
  +    </developer>
  +    <developer>
         <name>Pete Kazmier</name>
         <id>kaz</id>
         <email>[EMAIL PROTECTED]</email>
         <organization/>
  +      <roles>
  +        <role>Documentation</role>
  +        <role>Java Developer</role>
  +      </roles>
  +    </developer>
  +    <developer>
  +      <name>Brett Porter</name>
  +      <id>brett</id>
  +      <email>[EMAIL PROTECTED]</email>
  +      <organization>ASF</organization>
         <roles>
           <role>Documentation</role>
           <role>Java Developer</role>
  
  
  
  1.7       +0 -3      maven-plugins/file-activity/plugin.properties
  
  Index: plugin.properties
  ===================================================================
  RCS file: /home/cvs/maven-plugins/file-activity/plugin.properties,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- plugin.properties 2 May 2004 10:41:37 -0000       1.6
  +++ plugin.properties 19 Jul 2004 03:00:35 -0000      1.7
  @@ -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
  
  
  
  1.15      +3 -2      maven-plugins/file-activity/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/maven-plugins/file-activity/plugin.jelly,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- plugin.jelly      4 Mar 2004 18:13:19 -0000       1.14
  +++ plugin.jelly      19 Jul 2004 03:00:35 -0000      1.15
  @@ -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}"
               />
  
  
  
  1.12      +1 -0      maven-plugins/developer-activity/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/developer-activity/xdocs/changes.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- changes.xml       14 Jul 2004 23:08:52 -0000      1.11
  +++ changes.xml       19 Jul 2004 03:00:35 -0000      1.12
  @@ -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>
  
  
  
  1.6       +1 -1      
maven-plugins/file-activity/src/plugin-resources/maven-file-activity-plugin.jsl
  
  Index: maven-file-activity-plugin.jsl
  ===================================================================
  RCS file: 
/home/cvs/maven-plugins/file-activity/src/plugin-resources/maven-file-activity-plugin.jsl,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- maven-file-activity-plugin.jsl    21 Apr 2004 00:55:43 -0000      1.5
  +++ maven-file-activity-plugin.jsl    19 Jul 2004 03:00:35 -0000      1.6
  @@ -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:
  
  
  
  1.15      +2 -2      maven-plugins/developer-activity/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/maven-plugins/developer-activity/plugin.jelly,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- plugin.jelly      4 Mar 2004 18:03:53 -0000       1.14
  +++ plugin.jelly      19 Jul 2004 03:00:35 -0000      1.15
  @@ -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}"
               />
  
  
  
  1.32      +20 -0     maven-plugins/developer-activity/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/developer-activity/project.xml,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- project.xml       14 Jul 2004 23:08:52 -0000      1.31
  +++ project.xml       19 Jul 2004 03:00:35 -0000      1.32
  @@ -48,6 +48,26 @@
     </versions>
     <developers>
       <developer>
  +      <name>dIon Gillard</name>
  +      <id>dion</id>
  +      <email>[EMAIL PROTECTED]</email>
  +      <organization>ASF</organization>
  +      <roles>
  +        <role>Documentation</role>
  +        <role>Java Developer</role>
  +      </roles>
  +    </developer>
  +    <developer>
  +      <name>Brett Porter</name>
  +      <id>brett</id>
  +      <email>[EMAIL PROTECTED]</email>
  +      <organization>ASF</organization>
  +      <roles>
  +        <role>Documentation</role>
  +        <role>Java Developer</role>
  +      </roles>
  +    </developer>
  +    <developer>
         <name>Emmanuel Venisse</name>
         <id>evenisse</id>
         <email>[EMAIL PROTECTED]</email>
  
  
  
  1.7       +0 -1      maven-plugins/developer-activity/plugin.properties
  
  Index: plugin.properties
  ===================================================================
  RCS file: /home/cvs/maven-plugins/developer-activity/plugin.properties,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- plugin.properties 2 May 2004 10:41:38 -0000       1.6
  +++ plugin.properties 19 Jul 2004 03:00:35 -0000      1.7
  @@ -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
  
  
  
  1.5       +1 -1      
maven-plugins/developer-activity/src/plugin-resources/developer-activity.jsl
  
  Index: developer-activity.jsl
  ===================================================================
  RCS file: 
/home/cvs/maven-plugins/developer-activity/src/plugin-resources/developer-activity.jsl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- developer-activity.jsl    21 Apr 2004 00:55:43 -0000      1.4
  +++ developer-activity.jsl    19 Jul 2004 03:00:36 -0000      1.5
  @@ -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:
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to