You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2016/01/31 02:50:49 UTC
svn commit: r1727774 - in
/maven/plugins/trunk/maven-project-info-reports-plugin/src:
main/java/org/apache/maven/report/projectinfo/
main/java/org/apache/maven/report/projectinfo/dependencies/renderer/
main/resources/ site/apt/examples/ test/java/org/a...
Author: michaelo
Date: Sun Jan 31 01:50:48 2016
New Revision: 1727774
URL: http://svn.apache.org/viewvc?rev=1727774&view=rev
Log:
[MPIR-339] Align/pluralize name of project-info-report.properties and all of its usages
Added:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports.properties
- copied unchanged from r1727771, maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports_cs.properties
- copied unchanged from r1727689, maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_cs.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports_de.properties
- copied unchanged from r1727771, maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_de.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports_en.properties
- copied unchanged from r1727689, maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_en.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports_es.properties
- copied unchanged from r1727689, maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_es.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports_fr.properties
- copied unchanged from r1727689, maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_fr.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports_gl.properties
- copied unchanged from r1727689, maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_gl.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports_hu.properties
- copied unchanged from r1727689, maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_hu.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports_it.properties
- copied unchanged from r1727689, maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_it.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports_ja.properties
- copied unchanged from r1727689, maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_ja.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports_ko.properties
- copied unchanged from r1727689, maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_ko.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports_lt.properties
- copied unchanged from r1727689, maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_lt.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports_nl.properties
- copied unchanged from r1727689, maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_nl.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports_no.properties
- copied unchanged from r1727689, maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_no.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports_pl.properties
- copied unchanged from r1727689, maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_pl.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports_pt.properties
- copied unchanged from r1727689, maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_pt.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports_pt_BR.properties
- copied unchanged from r1727689, maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_pt_BR.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports_ru.properties
- copied unchanged from r1727689, maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_ru.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports_sk.properties
- copied unchanged from r1727689, maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_sk.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports_sv.properties
- copied unchanged from r1727689, maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_sv.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports_tr.properties
- copied unchanged from r1727689, maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_tr.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports_zh_CN.properties
- copied unchanged from r1727689, maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_zh_CN.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports_zh_TW.properties
- copied unchanged from r1727689, maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_zh_TW.properties
Removed:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_cs.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_de.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_en.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_es.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_fr.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_gl.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_hu.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_it.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_ja.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_ko.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_lt.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_nl.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_no.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_pl.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_pt.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_pt_BR.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_ru.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_sk.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_sv.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_tr.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_zh_CN.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_zh_TW.properties
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoRenderer.java
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/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/site/apt/examples/custom-report.apt.vm
maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtilsTest.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/test/resources/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.xml
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoRenderer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoRenderer.java?rev=1727774&r1=1727773&r2=1727774&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoRenderer.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoRenderer.java Sun Jan 31 01:50:48 2016
@@ -80,7 +80,7 @@ public abstract class AbstractProjectInf
*/
protected String getI18nString( String section, String key )
{
- return i18n.getString( "project-info-report", locale, "report." + section + '.' + key );
+ return i18n.getString( "project-info-reports", locale, "report." + section + '.' + key );
}
@Override
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=1727774&r1=1727773&r2=1727774&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 Sun Jan 31 01:50:48 2016
@@ -166,7 +166,7 @@ public abstract class AbstractProjectInf
*
* @since 2.3
*/
- @Parameter( defaultValue = "${project.basedir}/src/site/custom/project-info-report.properties" )
+ @Parameter( defaultValue = "${project.basedir}/src/site/custom/project-info-reports.properties" )
protected String customBundle;
/**
@@ -370,7 +370,7 @@ public abstract class AbstractProjectInf
*/
protected String getI18nString( Locale locale, String key )
{
- return getI18N( locale ).getString( "project-info-report", locale, "report." + getI18Nsection() + '.' + key );
+ return getI18N( locale ).getString( "project-info-reports", locale, "report." + getI18Nsection() + '.' + key );
}
/**
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java?rev=1727774&r1=1727773&r2=1727774&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java Sun Jan 31 01:50:48 2016
@@ -1612,7 +1612,7 @@ public class DependenciesRenderer
private String getString( String key )
{
- return i18n.getString( "project-info-report", locale, key );
+ return i18n.getString( "project-info-reports", locale, key );
}
}
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/site/apt/examples/custom-report.apt.vm
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/site/apt/examples/custom-report.apt.vm?rev=1727774&r1=1727773&r2=1727774&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/site/apt/examples/custom-report.apt.vm (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/site/apt/examples/custom-report.apt.vm Sun Jan 31 01:50:48 2016
@@ -41,7 +41,7 @@ Customize the Text Reports
<version>${project.version}</version>
<configuration>
<!-- By default -->
- <customBundle>\${project.basedir}/src/site/custom/project-info-report.properties</customBundle>
+ <customBundle>\${project.basedir}/src/site/custom/project-info-reports.properties</customBundle>
</configuration>
</plugin>
...
@@ -55,13 +55,13 @@ Customize the Text Reports
{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/}}
and edit them. For example, if you want to modify the Mailing List introduction, you should edit the <<<report.mailing-lists.intro>>> property.
- Extract of the default bundle {{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report.properties}project-info-report.properties}}:
+ Extract of the default bundle {{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports.properties}project-info-reports.properties}}:
+-----------------+
report.mailing-lists.intro = These are the mailing lists that have been established for this project. For each list, there is a subscribe, unsubscribe, and an archive link.
+-----------------+
- Extract of a custom bundle <<<$\{project.basedir\}/src/site/custom/project-info-report.properties>>> for the Apache Commons project:
+ Extract of a custom bundle <<<$\{project.basedir\}/src/site/custom/project-info-reports.properties>>> for the Apache Commons project:
+-----------------+
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtilsTest.java?rev=1727774&r1=1727773&r2=1727774&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtilsTest.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtilsTest.java Sun Jan 31 01:50:48 2016
@@ -127,7 +127,7 @@ public class ProjectInfoReportUtilsTest
assertTrue( ProjectInfoReportUtils.isArtifactUrlValid( "http://my.intern.domain:8080/test" ) );
// file
- URL url = new File( getBasedir(), "/target/classes/project-info-report.properties" ).toURI().toURL();
+ URL url = new File( getBasedir(), "/target/classes/project-info-reports.properties" ).toURI().toURL();
String content = ProjectInfoReportUtils.getContent( url, getMavenProjectStub( false ), settingsStub,
"ISO-8859-1" );
@@ -145,7 +145,7 @@ public class ProjectInfoReportUtilsTest
// http + no auth
startJetty( false, false );
- url = new URL( "http://localhost:" + port + "/project-info-report.properties" );
+ url = new URL( "http://localhost:" + port + "/project-info-reports.properties" );
content = ProjectInfoReportUtils.getContent( url, getMavenProjectStub( false ), settingsStub,
"ISO-8859-1" );
@@ -157,7 +157,7 @@ public class ProjectInfoReportUtilsTest
// http + auth
startJetty( false, true );
- url = new URL( "http://localhost:" + port + "/project-info-report.properties" );
+ url = new URL( "http://localhost:" + port + "/project-info-reports.properties" );
content = ProjectInfoReportUtils.getContent( url, getMavenProjectStub( false ), settingsStub,
"ISO-8859-1" );
@@ -169,7 +169,7 @@ public class ProjectInfoReportUtilsTest
// https + no auth
startJetty( true, false );
- url = new URL( "https://localhost:" + port + "/project-info-report.properties" );
+ url = new URL( "https://localhost:" + port + "/project-info-reports.properties" );
content = ProjectInfoReportUtils.getContent( url, getMavenProjectStub( true ), settingsStub,
"ISO-8859-1" );
@@ -181,7 +181,7 @@ public class ProjectInfoReportUtilsTest
// https + auth
startJetty( true, true );
- url = new URL( "https://localhost:" + port + "/project-info-report.properties" );
+ url = new URL( "https://localhost:" + port + "/project-info-reports.properties" );
content = ProjectInfoReportUtils.getContent( url, getMavenProjectStub( true ), settingsStub,
"ISO-8859-1" );
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/resources/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/resources/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.xml?rev=1727774&r1=1727773&r2=1727774&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/resources/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.xml (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/resources/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.xml Sun Jan 31 01:50:48 2016
@@ -25,7 +25,7 @@ under the License.
<role>org.codehaus.plexus.i18n.I18N</role>
<implementation>org.codehaus.plexus.i18n.DefaultI18N</implementation>
<configuration>
- <default-bundle-name>project-info-report</default-bundle-name>
+ <default-bundle-name>project-info-reports</default-bundle-name>
</configuration>
</component>
</components>