Author: michaelo Date: Sat Nov 1 23:05:07 2014 New Revision: 1636067 URL: http://svn.apache.org/r1636067 Log: [MPIR-305] Upgrade Doxia + Site Tools to 1.6
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/AbstractProjectInfoReport.java maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report.properties maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/CimReportTest.java maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependenciesReportTest.java maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependencyConvergenceReportTest.java maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependencyManagementReportTest.java maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/IssueTrackingReportTest.java maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/LicenseReportTest.java maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/MailingListsReportTest.java maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ModulesReportTest.java maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/PluginManagementReportTest.java maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ProjectIndexPageReportTest.java maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ProjectSummaryReportTest.java maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ScmReportTest.java maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/TeamListReportTest.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=1636067&r1=1636066&r2=1636067&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml Sat Nov 1 23:05:07 2014 @@ -112,8 +112,8 @@ under the License. </distributionManagement> <properties> - <doxiaVersion>1.4</doxiaVersion> - <doxia-sitetoolsVersion>1.2</doxia-sitetoolsVersion> + <doxiaVersion>1.6</doxiaVersion> + <doxia-sitetoolsVersion>1.6</doxia-sitetoolsVersion> <mavenVersion>2.2.1</mavenVersion> <wagonVersion>2.7</wagonVersion> <scmVersion>1.9.2</scmVersion> Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java?rev=1636067&r1=1636066&r2=1636067&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java Sat Nov 1 23:05:07 2014 @@ -40,11 +40,11 @@ import org.apache.maven.artifact.Artifac import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.resolver.ArtifactResolver; -import org.apache.maven.doxia.sink.render.RenderingContext; import org.apache.maven.doxia.site.decoration.Body; import org.apache.maven.doxia.site.decoration.DecorationModel; import org.apache.maven.doxia.siterenderer.Renderer; import org.apache.maven.doxia.siterenderer.RendererException; +import org.apache.maven.doxia.siterenderer.RenderingContext; import org.apache.maven.doxia.siterenderer.SiteRenderingContext; import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink; import org.apache.maven.doxia.tools.SiteTool; @@ -288,7 +288,7 @@ public abstract class AbstractProjectInf { return project; } - + protected Plugin getPlugin( String pluginId ) { if ( ( getProject().getBuild() == null ) || ( getProject().getBuild().getPluginsAsMap() == null ) ) @@ -306,7 +306,7 @@ public abstract class AbstractProjectInf return plugin; } - + protected String getPluginParameter( String pluginId, String param ) { Plugin plugin = getPlugin( pluginId ); Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report.properties?rev=1636067&r1=1636066&r2=1636067&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report.properties (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report.properties Sat Nov 1 23:05:07 2014 @@ -247,7 +247,7 @@ report.team-list.intro.title report.team-list.name = Project Team report.team-list.nocontributor = There are no contributors listed for this project. Please check back again later. report.team-list.nodeveloper = There are no developers working on this project. -report.team-list.title = Team list +report.team-list.title = Project Team report.dependencyManagement.name = Dependency Management report.dependencyManagement.description = This document lists the dependencies that are defined through dependencyManagement. report.dependencyManagement.title = Project Dependency Management Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java?rev=1636067&r1=1636066&r2=1636067&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java Sat Nov 1 23:05:07 2014 @@ -113,6 +113,29 @@ public abstract class AbstractProjectInf } /** + * Gets a fully qualified title as generated by Doxia 1.6 + * + * @param name the name to prepare + * @param title the title to prepare + * @return the prepared title as per Doxia 1.6 + * @since 2.8 + */ + protected String prepareTitle( String name, String title ) + { + if ( StringUtils.isEmpty( name ) ) + { + throw new IllegalArgumentException( "The name cannot be empty" ); + } + + if ( StringUtils.isEmpty( title ) ) + { + throw new IllegalArgumentException( "The title cannot be empty" ); + } + + return String.format( "%s \u2013 %s", name, title ); + } + + /** * Get the current Maven project * * @return the maven project Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/CimReportTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/CimReportTest.java?rev=1636067&r1=1636066&r2=1636067&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/CimReportTest.java (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/CimReportTest.java Sat Nov 1 23:05:07 2014 @@ -63,7 +63,9 @@ public class CimReportTest assertTrue( response.getContentLength() > 0 ); // Test the Page title - assertEquals( getString( "report.cim.title" ), response.getTitle() ); + String expectedTitle = prepareTitle( getString( "report.cim.name" ), + getString( "report.cim.title" ) ); + assertEquals( expectedTitle, response.getTitle() ); // Test the texts TextBlock[] textBlocks = response.getTextBlocks(); Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependenciesReportTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependenciesReportTest.java?rev=1636067&r1=1636066&r2=1636067&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependenciesReportTest.java (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependenciesReportTest.java Sat Nov 1 23:05:07 2014 @@ -64,7 +64,9 @@ public class DependenciesReportTest assertTrue( response.getContentLength() > 0 ); // Test the Page title - assertEquals( getString( "report.dependencies.title" ), response.getTitle() ); + String expectedTitle = prepareTitle( getString( "report.dependencies.name" ), + getString( "report.dependencies.title" ) ); + assertEquals( expectedTitle, response.getTitle() ); // Test the tables WebTable[] webTables = response.getTables(); Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependencyConvergenceReportTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependencyConvergenceReportTest.java?rev=1636067&r1=1636066&r2=1636067&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependencyConvergenceReportTest.java (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependencyConvergenceReportTest.java Sat Nov 1 23:05:07 2014 @@ -63,7 +63,9 @@ public class DependencyConvergenceReport assertTrue( response.getContentLength() > 0 ); // Test the Page title - assertEquals( getString( "report.dependency-convergence.reactor.title" ), response.getTitle() ); + String expectedTitle = prepareTitle( getString( "report.dependency-convergence.name" ), + getString( "report.dependency-convergence.reactor.title" ) ); + assertEquals( expectedTitle, response.getTitle() ); // Test the texts TextBlock[] textBlocks = response.getTextBlocks(); Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependencyManagementReportTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependencyManagementReportTest.java?rev=1636067&r1=1636066&r2=1636067&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependencyManagementReportTest.java (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependencyManagementReportTest.java Sat Nov 1 23:05:07 2014 @@ -64,7 +64,9 @@ public class DependencyManagementReportT assertTrue( response.getContentLength() > 0 ); // Test the Page title - assertEquals( getString( "report.dependencyManagement.title" ), response.getTitle() ); + String expectedTitle = prepareTitle( getString( "report.dependencyManagement.name" ), + getString( "report.dependencyManagement.title" ) ); + assertEquals( expectedTitle, response.getTitle() ); // Test the tables WebTable[] webTables = response.getTables(); 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=1636067&r1=1636066&r2=1636067&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 Sat Nov 1 23:05:07 2014 @@ -64,7 +64,9 @@ public class IssueTrackingReportTest assertTrue( response.getContentLength() > 0 ); // Test the Page title - assertEquals( getString( "report.issuetracking.title" ), response.getTitle() ); + String expectedTitle = prepareTitle( getString( "report.issuetracking.name" ), + getString( "report.issuetracking.title" ) ); + assertEquals( expectedTitle, response.getTitle() ); // Test the links WebLink[] weblinks = response.getLinks(); Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/LicenseReportTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/LicenseReportTest.java?rev=1636067&r1=1636066&r2=1636067&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/LicenseReportTest.java (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/LicenseReportTest.java Sat Nov 1 23:05:07 2014 @@ -64,7 +64,9 @@ public class LicenseReportTest assertTrue( response.getContentLength() > 0 ); // Test the Page title - assertEquals( getString( "report.license.title" ), response.getTitle() ); + String expectedTitle = prepareTitle( getString( "report.license.name" ), + getString( "report.license.title" ) ); + assertEquals( expectedTitle, response.getTitle() ); // Test the texts TextBlock[] textBlocks = response.getTextBlocks(); @@ -78,7 +80,7 @@ public class LicenseReportTest assertEquals( 1, links.length ); assertEquals( "http://maven.apache.org/", links[0].getURLString() ); } - + public void testReportLinksOnly() throws Exception { @@ -97,7 +99,9 @@ public class LicenseReportTest assertTrue( response.getContentLength() > 0 ); // Test the Page title - assertEquals( getString( "report.license.title" ), response.getTitle() ); + String expectedTitle = prepareTitle( getString( "report.license.name" ), + getString( "report.license.title" ) ); + assertEquals( expectedTitle, response.getTitle() ); // Test the texts TextBlock[] textBlocks = response.getTextBlocks(); Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/MailingListsReportTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/MailingListsReportTest.java?rev=1636067&r1=1636066&r2=1636067&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/MailingListsReportTest.java (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/MailingListsReportTest.java Sat Nov 1 23:05:07 2014 @@ -68,7 +68,9 @@ public class MailingListsReportTest assertTrue( response.getContentLength() > 0 ); // Test the Page title - assertEquals( getString( "report.mailing-lists.title" ), response.getTitle() ); + String expectedTitle = prepareTitle( getString( "report.mailing-lists.name" ), + getString( "report.mailing-lists.title" ) ); + assertEquals( expectedTitle, response.getTitle() ); // Test the texts TextBlock[] textBlocks = response.getTextBlocks(); Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ModulesReportTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ModulesReportTest.java?rev=1636067&r1=1636066&r2=1636067&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ModulesReportTest.java (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ModulesReportTest.java Sat Nov 1 23:05:07 2014 @@ -62,7 +62,9 @@ public class ModulesReportTest assertTrue( response.getContentLength() > 0 ); // Test the Page title - assertEquals( getString( "report.modules.title" ), response.getTitle() ); + String expectedTitle = prepareTitle( getString( "report.modules.name" ), + getString( "report.modules.title" ) ); + assertEquals( expectedTitle, response.getTitle() ); // Test the texts TextBlock[] textBlocks = response.getTextBlocks(); Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/PluginManagementReportTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/PluginManagementReportTest.java?rev=1636067&r1=1636066&r2=1636067&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/PluginManagementReportTest.java (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/PluginManagementReportTest.java Sat Nov 1 23:05:07 2014 @@ -64,7 +64,9 @@ public class PluginManagementReportTest assertTrue( response.getContentLength() > 0 ); // Test the Page title - assertEquals( getString( "report.pluginManagement.title" ), response.getTitle() ); + String expectedTitle = prepareTitle( getString( "report.pluginManagement.name" ), + getString( "report.pluginManagement.title" ) ); + assertEquals( expectedTitle, response.getTitle() ); // Test the tables WebTable[] webTables = response.getTables(); Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ProjectIndexPageReportTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ProjectIndexPageReportTest.java?rev=1636067&r1=1636066&r2=1636067&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ProjectIndexPageReportTest.java (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ProjectIndexPageReportTest.java Sat Nov 1 23:05:07 2014 @@ -63,7 +63,10 @@ public class ProjectIndexPageReportTest assertTrue( response.getContentLength() > 0 ); // Test the Page title - assertEquals( getString( "report.index.title" ), response.getTitle() ); + // Index does not have a 'name' but 'title' only + String expectedTitle = prepareTitle( getString( "report.index.title" ), + getString( "report.index.title" ) ); + assertEquals( expectedTitle, response.getTitle() ); // Test the texts TextBlock[] textBlocks = response.getTextBlocks(); Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ProjectSummaryReportTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ProjectSummaryReportTest.java?rev=1636067&r1=1636066&r2=1636067&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ProjectSummaryReportTest.java (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ProjectSummaryReportTest.java Sat Nov 1 23:05:07 2014 @@ -63,7 +63,9 @@ public class ProjectSummaryReportTest assertTrue( response.getContentLength() > 0 ); // Test the Page title - assertEquals( getString( "report.summary.title" ), response.getTitle() ); + String expectedTitle = prepareTitle( getString( "report.summary.name" ), + getString( "report.summary.title" ) ); + assertEquals( expectedTitle, response.getTitle() ); // Test the texts TextBlock[] textBlocks = response.getTextBlocks(); Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ScmReportTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ScmReportTest.java?rev=1636067&r1=1636066&r2=1636067&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ScmReportTest.java (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ScmReportTest.java Sat Nov 1 23:05:07 2014 @@ -66,7 +66,9 @@ public class ScmReportTest assertTrue( response.getContentLength() > 0 ); // Test the Page title - assertEquals( getString( "report.scm.title" ), response.getTitle() ); + String expectedTitle = prepareTitle( getString( "report.scm.name" ), + getString( "report.scm.title" ) ); + assertEquals( expectedTitle, response.getTitle() ); // Test the texts TextBlock[] textBlocks = response.getTextBlocks(); Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/TeamListReportTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/TeamListReportTest.java?rev=1636067&r1=1636066&r2=1636067&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/TeamListReportTest.java (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/TeamListReportTest.java Sat Nov 1 23:05:07 2014 @@ -67,7 +67,9 @@ public class TeamListReportTest assertTrue( response.getContentLength() > 0 ); // Test the Page title - assertEquals( getString( "report.team-list.title" ), response.getTitle() ); + String expectedTitle = prepareTitle( getString( "report.team-list.name" ), + getString( "report.team-list.title" ) ); + assertEquals( expectedTitle, response.getTitle() ); assertTrue( response.getText().contains( "gravatar" ));