You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2008/07/22 03:39:10 UTC
svn commit: r678613 - in /maven/plugins/trunk/maven-changes-plugin/src:
it/report-changes-system/ it/report-changes-system/src/changes/
main/java/org/apache/maven/plugin/changes/ main/resources/
Author: olamy
Date: Mon Jul 21 18:39:10 2008
New Revision: 678613
URL: http://svn.apache.org/viewvc?rev=678613&view=rev
Log:
[MCHANGES-69] Add a date elment or attribute inside the action element of changes.xml
Modified:
maven/plugins/trunk/maven-changes-plugin/src/it/report-changes-system/pom.xml
maven/plugins/trunk/maven-changes-plugin/src/it/report-changes-system/src/changes/changes.xml
maven/plugins/trunk/maven-changes-plugin/src/it/report-changes-system/verify.bsh
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/Action.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesXML.java
maven/plugins/trunk/maven-changes-plugin/src/main/resources/changes-report.properties
maven/plugins/trunk/maven-changes-plugin/src/main/resources/changes-report_de.properties
Modified: maven/plugins/trunk/maven-changes-plugin/src/it/report-changes-system/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/it/report-changes-system/pom.xml?rev=678613&r1=678612&r2=678613&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/it/report-changes-system/pom.xml (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/it/report-changes-system/pom.xml Mon Jul 21 18:39:10 2008
@@ -51,6 +51,7 @@
<issueLinkTemplatePerSystem>
<qc>http://localhost/%ISSUE%</qc>
</issueLinkTemplatePerSystem>
+ <addActionDate>true</addActionDate>
</configuration>
<reportSets>
<reportSet>
Modified: maven/plugins/trunk/maven-changes-plugin/src/it/report-changes-system/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/it/report-changes-system/src/changes/changes.xml?rev=678613&r1=678612&r2=678613&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/it/report-changes-system/src/changes/changes.xml (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/it/report-changes-system/src/changes/changes.xml Mon Jul 21 18:39:10 2008
@@ -40,7 +40,7 @@
</release>
<release version="1.0" date="2005-01-01" description="First release">
- <action dev="me" type="update">
+ <action dev="me" type="update" date="2008-01-01">
Uploaded documentation on how to use the plugin.
</action>
</release>
Modified: maven/plugins/trunk/maven-changes-plugin/src/it/report-changes-system/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/it/report-changes-system/verify.bsh?rev=678613&r1=678612&r2=678613&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/it/report-changes-system/verify.bsh (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/it/report-changes-system/verify.bsh Mon Jul 21 18:39:10 2008
@@ -49,12 +49,19 @@
System.err.println( "changes-report.html doesn't contains jira issue link" );
return false;
}
- indexOf = reportContent.indexOf( " <a href=\"http://localhost/1212\" class=\"externalLink\">1212</a>" );
+ indexOf = reportContent.indexOf( "<a href=\"http://localhost/1212\" class=\"externalLink\">1212</a>" );
if ( indexOf < 0)
{
System.err.println( "changes-report.html doesn't contains qc issue link" );
return false;
}
+ indexOf = reportContent.indexOf( "2008-01-01" );
+ if ( indexOf < 0)
+ {
+ System.err.println( "changes-report.html doesn't contains date 2008-01-01" );
+ return false;
+ }
+
}
catch( Throwable e )
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/Action.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/Action.java?rev=678613&r1=678612&r2=678613&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/Action.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/Action.java Mon Jul 21 18:39:10 2008
@@ -40,6 +40,8 @@
private String system;
+ private String date;
+
public Action()
{
}
@@ -113,4 +115,14 @@
{
this.system = system;
}
+
+ public String getDate()
+ {
+ return date;
+ }
+
+ public void setDate( String date )
+ {
+ this.date = date;
+ }
}
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java?rev=678613&r1=678612&r2=678613&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java Mon Jul 21 18:39:10 2008
@@ -82,6 +82,13 @@
*/
private String url;
+
+ /**
+ * @parameter expression="${changes.addActionDate}" default-value="false"
+ * @since 2.0-beta-2
+ */
+ private boolean addActionDate;
+
public boolean canGenerateReport()
{
return xmlPath.isFile();
@@ -117,11 +124,14 @@
throws MavenReportException
{
ChangesReportGenerator report = new ChangesReportGenerator( xmlPath, getLog() );
+
report.setIssueLinksPerSystem( issueLinkTemplatePerSystem );
report.setIssueLink( issueLinkTemplate );
report.setUrl( url );
+ report.setAddActionDate( addActionDate );
+
if ( !report.canGenerateIssueLinks() )
{
getLog().warn( "No issue management URL defined in POM. Links to your issues will not work correctly." );
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java?rev=678613&r1=678612&r2=678613&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java Mon Jul 21 18:39:10 2008
@@ -55,6 +55,8 @@
private String url;
private Map issueLinksPerSystem;
+
+ private boolean addActionDate;
public ChangesReportGenerator()
{
@@ -111,6 +113,16 @@
this.issueLinksPerSystem = issueLinksPerSystem;
}
+ public boolean isAddActionDate()
+ {
+ return addActionDate;
+ }
+
+ public void setAddActionDate( boolean addActionDate )
+ {
+ this.addActionDate = addActionDate;
+ }
+
/**
* Checks whether links to the issues can be generated.
*
@@ -129,7 +141,7 @@
public boolean canGenerateIssueLinks()
{
- if (this.issueLinksPerSystem == null || this.issueLinksPerSystem.isEmpty() )
+ if ( this.issueLinksPerSystem == null || this.issueLinksPerSystem.isEmpty() )
{
return false;
}
@@ -167,7 +179,11 @@
sinkHeader( sink, bundle.getString( "report.changes.label.changes" ) );
sinkHeader( sink, bundle.getString( "report.changes.label.by" ) );
-
+
+ if ( this.isAddActionDate() )
+ {
+ sinkHeader( sink, bundle.getString( "report.changes.label.date" ) );
+ }
sink.tableRow_();
for ( int idx = 0; idx < actionList.size(); idx++ )
@@ -224,7 +240,12 @@
sink.tableCell_();
sinkCellLink( sink, action.getDev(), "team-list.html#" + action.getDev() );
-
+
+ if ( this.isAddActionDate() )
+ {
+ sinkCell( sink, action.getDate() );
+ }
+
sink.tableRow_();
}
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesXML.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesXML.java?rev=678613&r1=678612&r2=678613&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesXML.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesXML.java Mon Jul 21 18:39:10 2008
@@ -189,6 +189,8 @@
action.setIssue( attrs.getValue( "issue" ) );
action.setSystem( attrs.getValue( "system" ) );
+
+ action.setDate( attrs.getValue( "date" ) );
}
currentName = qName;
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/resources/changes-report.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/resources/changes-report.properties?rev=678613&r1=678612&r2=678613&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/resources/changes-report.properties (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/resources/changes-report.properties Mon Jul 21 18:39:10 2008
@@ -26,6 +26,7 @@
report.changes.label.changes=Changes
report.changes.label.description=Description
report.changes.label.by=By
+report.changes.label.date=Date
report.changes.text.rssfeed=Get the RSS feed of the last changes
report.changes.text.thanx=Thanks to
report.changes.text.fixes=Fixes
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/resources/changes-report_de.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/resources/changes-report_de.properties?rev=678613&r1=678612&r2=678613&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/resources/changes-report_de.properties (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/resources/changes-report_de.properties Mon Jul 21 18:39:10 2008
@@ -26,6 +26,7 @@
report.changes.label.changes=Änderungen
report.changes.label.description=Beschreibung
report.changes.label.by=Durch
+report.changes.label.date=Date
report.changes.text.rssfeed=RSS-Feed der letzten Änderungen
report.changes.text.thanx=Dank gilt
report.changes.text.fixes=Schließt