You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by vs...@apache.org on 2009/08/13 14:52:17 UTC
svn commit: r803868 - in
/maven/plugins/trunk/maven-project-info-reports-plugin: ./
src/main/java/org/apache/maven/report/projectinfo/
src/test/java/org/apache/maven/report/projectinfo/
Author: vsiveton
Date: Thu Aug 13 12:52:16 2009
New Revision: 803868
URL: http://svn.apache.org/viewvc?rev=803868&view=rev
Log:
MPIR-173: Review the Doxia Sink calls
o fixed calls
o updated test case
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/IssueTrackingReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/IssueTrackingReportTest.java
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml?rev=803868&r1=803867&r2=803868&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml Thu Aug 13 12:52:16 2009
@@ -120,7 +120,7 @@
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>2.0.4.2</version>
+ <version>2.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java?rev=803868&r1=803867&r2=803868&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java Thu Aug 13 12:52:16 2009
@@ -127,6 +127,7 @@
// Overview
startSection( i18n.getString( "project-info-report", locale, "report.cim.overview.title" ) );
+ sink.paragraph();
if ( isCimSystem( system, "anthill" ) )
{
linkPatternedText( i18n.getString( "project-info-report", locale, "report.cim.anthill.intro" ) );
@@ -155,6 +156,7 @@
{
linkPatternedText( i18n.getString( "project-info-report", locale, "report.cim.general.intro" ) );
}
+ sink.paragraph_();
endSection();
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/IssueTrackingReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/IssueTrackingReport.java?rev=803868&r1=803867&r2=803868&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/IssueTrackingReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/IssueTrackingReport.java Thu Aug 13 12:52:16 2009
@@ -125,17 +125,23 @@
if ( isIssueManagementSystem( system, "jira" ) )
{
+ sink.paragraph();
linkPatternedText( i18n.getString( "project-info-report", locale, "report.issuetracking.jira.intro" ) );
+ sink.paragraph_();
}
else if ( isIssueManagementSystem( system, "bugzilla" ) )
{
+ sink.paragraph();
linkPatternedText(
i18n.getString( "project-info-report", locale, "report.issuetracking.bugzilla.intro" ) );
+ sink.paragraph_();
}
else if ( isIssueManagementSystem( system, "scarab" ) )
{
+ sink.paragraph();
linkPatternedText(
i18n.getString( "project-info-report", locale, "report.issuetracking.scarab.intro" ) );
+ sink.paragraph_();
}
else if ( system == null || "".equals( system.trim() ) )
{
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java?rev=803868&r1=803867&r2=803868&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java Thu Aug 13 12:52:16 2009
@@ -250,23 +250,33 @@
if ( isScmSystem( anonymousRepository, "clearcase" ) )
{
+ sink.paragraph();
linkPatternedText( i18n.getString( "project-info-report", locale, "report.scm.clearcase.intro" ) );
+ sink.paragraph_();
}
else if ( isScmSystem( anonymousRepository, "cvs" ) )
{
+ sink.paragraph();
linkPatternedText( i18n.getString( "project-info-report", locale, "report.scm.cvs.intro" ) );
+ sink.paragraph_();
}
else if ( isScmSystem( anonymousRepository, "perforce" ) )
{
+ sink.paragraph();
linkPatternedText( i18n.getString( "project-info-report", locale, "report.scm.perforce.intro" ) );
+ sink.paragraph_();
}
else if ( isScmSystem( anonymousRepository, "starteam" ) )
{
+ sink.paragraph();
linkPatternedText( i18n.getString( "project-info-report", locale, "report.scm.starteam.intro" ) );
+ sink.paragraph_();
}
else if ( isScmSystem( anonymousRepository, "svn" ) )
{
+ sink.paragraph();
linkPatternedText( i18n.getString( "project-info-report", locale, "report.scm.svn.intro" ) );
+ sink.paragraph_();
}
else
{
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java?rev=803868&r1=803867&r2=803868&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java Thu Aug 13 12:52:16 2009
@@ -226,13 +226,13 @@
endTable();
}
- endSection();
-
- endSection();
-
// To handle JS
javascript.append( "}\n" ).append( "\n" ).append( "window.onLoad = init();\n" );
javaScript( javascript.toString() );
+
+ endSection();
+
+ endSection();
}
private void renderDeveloper( Developer developer, int developerRow, Map headersMap, StringBuffer javascript )
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/IssueTrackingReportTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/IssueTrackingReportTest.java?rev=803868&r1=803867&r2=803868&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/IssueTrackingReportTest.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/IssueTrackingReportTest.java Thu Aug 13 12:52:16 2009
@@ -78,6 +78,7 @@
// Test the texts
TextBlock[] textBlocks = response.getTextBlocks();
assertEquals( textBlocks[0].getText(), getString( "report.issuetracking.overview.title" ) );
- assertEquals( textBlocks[1].getText(), getString( "report.issuetracking.name" ) );
+ assertEquals( textBlocks[1].getText(), "This project uses JIRA a J2EE-based, issue tracking and project management application." ); // due to link pattern
+ assertEquals( textBlocks[2].getText(), getString( "report.issuetracking.name" ) );
}
}