Author: evenisse
Date: Thu Oct 18 09:06:21 2007
New Revision: 586021
URL: http://svn.apache.org/viewvc?rev=586021&view=rev
Log:
[MRRESOURCES-24] use projectsSortedByOrganization from context to make a more
readable NOTICE
Modified:
maven/resources/trunk/apache-jar-resource-bundle/ (props changed)
maven/resources/trunk/apache-jar-resource-bundle/src/main/resources/META-INF/NOTICE.vm
Propchange: maven/resources/trunk/apache-jar-resource-bundle/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Oct 18 09:06:21 2007
@@ -0,0 +1 @@
+target
Modified:
maven/resources/trunk/apache-jar-resource-bundle/src/main/resources/META-INF/NOTICE.vm
URL:
http://svn.apache.org/viewvc/maven/resources/trunk/apache-jar-resource-bundle/src/main/resources/META-INF/NOTICE.vm?rev=586021&r1=586020&r2=586021&view=diff
==============================================================================
---
maven/resources/trunk/apache-jar-resource-bundle/src/main/resources/META-INF/NOTICE.vm
(original)
+++
maven/resources/trunk/apache-jar-resource-bundle/src/main/resources/META-INF/NOTICE.vm
Thu Oct 18 09:06:21 2007
@@ -8,32 +8,22 @@
Copyright ${projectTimespan}#if($project.organization.name)
$project.organization.name#else The Apache Software Foundation#end
-
-This product includes software developed at
-#if($project.organization.name)$project.organization.name
($project.organization.url).#else
-The Apache Software Foundation (http://www.apache.org/).#end
-
#if($preProjectText)
$preProjectText
#end
-#if(!$noProjects)
-#foreach ( $project in $projects )
-This product includes/uses software, $project.name#if($project.url)
($project.url)#end
-#if( $project.organization.name )
-,
-developed by $project.organization.name #if( $project.organization.url )
($project.organization.url)#end
-#end
-#if ($addLicense)#foreach ( $license in $project.licenses)
+#foreach ( $organizationName in $projectsSortedByOrganization.keySet() )
+This product includes/uses software(s) developed by
'$organizationName.name'#if($organizationName.url) ($organizationName.url)#end
-License: $license.name #if ($license.url) ($license.url)#end
+#foreach ( $project in $projectsSortedByOrganization.get( $organizationName ) )
+ - $project.name#if($project.url) ($project.url)#end
+#if ($addLicense)#foreach ( $license in $project.licenses)
+ License: $license.name #if ($license.url) ($license.url)#end
#end#end
-
#end
#end
#if($postProjectText)
$postProjectText
#end
-
