You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by dk...@apache.org on 2007/02/27 16:40:52 UTC
svn commit: r512287 - in /maven/resources/trunk: apache-incubator-disclaimer-resource-bundle/ apache-incubator-disclaimer-resource-bundle/src/main/resources/META-INF/ apache-jar-resource-bundle/ apache-jar-resource-bundle/src/main/resources/META-INF/

Author: dkulp
Date: Tue Feb 27 07:40:51 2007
New Revision: 512287

URL: http://svn.apache.org/viewvc?view=rev&rev=512287
Log:
Merge changes from sandbox. (MRRESOURCES-12 included)

Added:
    maven/resources/trunk/apache-incubator-disclaimer-resource-bundle/src/main/resources/META-INF/DISCLAIMER.vm
      - copied unchanged from r511874, maven/sandbox/trunk/resources/apache-incubator-disclaimer-resource-bundle/src/main/resources/META-INF/DISCLAIMER.vm
Removed:
    maven/resources/trunk/apache-incubator-disclaimer-resource-bundle/src/main/resources/META-INF/DISCLAIMER.txt
Modified:
    maven/resources/trunk/apache-incubator-disclaimer-resource-bundle/pom.xml
    maven/resources/trunk/apache-jar-resource-bundle/pom.xml
    maven/resources/trunk/apache-jar-resource-bundle/src/main/resources/META-INF/NOTICE.vm

Modified: maven/resources/trunk/apache-incubator-disclaimer-resource-bundle/pom.xml
URL: http://svn.apache.org/viewvc/maven/resources/trunk/apache-incubator-disclaimer-resource-bundle/pom.xml?view=diff&rev=512287&r1=512286&r2=512287
==============================================================================
--- maven/resources/trunk/apache-incubator-disclaimer-resource-bundle/pom.xml (original)
+++ maven/resources/trunk/apache-incubator-disclaimer-resource-bundle/pom.xml Tue Feb 27 07:40:51 2007
@@ -4,10 +4,10 @@
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache-resource-bundles</artifactId>
-    <version>2-SNAPSHOT</version>
+    <version>1</version>
   </parent>
   <artifactId>apache-incubator-disclaimer-resource-bundle</artifactId>
-  <name>Apache License Header Resource Bundle</name>
+  <name>Apache Incubator Disclaimer Resource Bundle</name>
   <version>1.1-SNAPSHOT</version>
   <inceptionYear>2006</inceptionYear>
   <description>

Modified: maven/resources/trunk/apache-jar-resource-bundle/pom.xml
URL: http://svn.apache.org/viewvc/maven/resources/trunk/apache-jar-resource-bundle/pom.xml?view=diff&rev=512287&r1=512286&r2=512287
==============================================================================
--- maven/resources/trunk/apache-jar-resource-bundle/pom.xml (original)
+++ maven/resources/trunk/apache-jar-resource-bundle/pom.xml Tue Feb 27 07:40:51 2007
@@ -8,7 +8,7 @@
   </parent>
   <artifactId>apache-jar-resource-bundle</artifactId>
   <name>Apache JAR Resource Bundle</name>
-  <version>1.2-SNAPSHOT</version>
+  <version>1.1.1-SNAPSHOT</version>
   <inceptionYear>2006</inceptionYear>
   <description>
     An archive which contains templates for generating the necessary license files and notices for all Apache releases.

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?view=diff&rev=512287&r1=512286&r2=512287
==============================================================================
--- 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 Tue Feb 27 07:40:51 2007
@@ -1,13 +1,17 @@
 // ------------------------------------------------------------------
 // NOTICE file corresponding to the section 4d of The Apache License,
-// Version 2.0, in this case for ${project.name}
+// Version 2.0, in this case for #if ($projectName)$projectName#else${project.name}#end
+
 // ------------------------------------------------------------------
 
-${project.name}
-Copyright ${projectTimespan} The Apache Software Foundation
+#if ($projectName)$projectName#else${project.name}#end
+
+Copyright ${projectTimespan}#if($project.organization.name) $project.organization.name#else The Apache Software Foundation#end
+
 
 This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
+#if($project.organization.name)$project.organization.name ($project.organization.url).#else
+The Apache Software Foundation (http://www.apache.org/).#end
 
 #if($preProjectText)
 $preProjectText