Author: hboutemy
Date: Sun Jul 31 12:53:40 2011
New Revision: 1152572
URL: http://svn.apache.org/viewvc?rev=1152572&view=rev
Log:
[MPIR-227] added an introduction text when there are multiple licenses
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.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/main/resources/project-info-report_fr.properties
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java?rev=1152572&r1=1152571&r2=1152572&view=diff
==============================================================================
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java
(original)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java
Sun Jul 31 12:53:40 2011
@@ -257,19 +257,25 @@ public class LicenseReport
// License
startSection( getI18nString( "title" ) );
- boolean renderLicenseIndex = ( ( licenses.size() > 1 ) &&
!linkOnly );
- if ( renderLicenseIndex )
+ if ( licenses.size() > 1 )
{
- sink.list();
- for ( License license : licenses )
- {
- String name = license.getName();
+ // multiple licenses
+ paragraph( getI18nString( "multiple" ) );
- sink.listItem();
- link( "#" + HtmlTools.encodeId( name ), name );
- sink.listItem_();
+ if ( !linkOnly )
+ {
+ // add an index before licenses content
+ sink.list();
+ for ( License license : licenses )
+ {
+ String name = license.getName();
+
+ sink.listItem();
+ link( "#" + HtmlTools.encodeId( name ), name );
+ sink.listItem_();
+ }
+ sink.list_();
}
- sink.list_();
}
for ( License license : licenses )
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=1152572&r1=1152571&r2=1152572&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
Sun Jul 31 12:53:40 2011
@@ -124,8 +124,9 @@ report.issuetracking.overview.title
report.issuetracking.scarab.intro = This
project uses {Scarab, http://scarab.tigris.org/}.
report.issuetracking.title = Issue
Tracking
report.license.description = This is a
link to the definitions of project licenses.
+report.license.multiple = This
project is provided under multiple licenses:
report.license.name = Project
License
-report.license.nolicense = No
project license is defined for this project.
+report.license.nolicense = No
license is defined for this project.
report.license.overview.intro = Typically
the licenses listed for the project are that of the project itself, and not of
dependencies.
report.license.overview.title = Overview
report.license.title = Project
License
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_fr.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_fr.properties?rev=1152572&r1=1152571&r2=1152572&view=diff
==============================================================================
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_fr.properties
(original)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_fr.properties
Sun Jul 31 12:53:40 2011
@@ -124,6 +124,7 @@ report.issuetracking.overview.title
report.issuetracking.scarab.intro = Ce projet
utilise {Scarab, http://scarab.tigris.org/}.
report.issuetracking.title =
Contr\u00f4le des livraisons
report.license.description = C'est un
lien \u00e0 la licence du projet.
+report.license.multiple = Ce projet
est publi\u00e9 sous plusieurs licences:
report.license.name = Licence
du projet
report.license.nolicense = Aucune
licence n'est d\u00e9finie pour ce projet.
report.license.overview.intro =
Typiquement les licences \u00e9num\u00e9r\u00e9s pour ce projet sont celles du
projet lui-m\u00eame, et non celles des d\u00e9pendances.
