svn commit: r644571 - in /incubator/abdera/java/branches/abdera-0.4.0-incubating/distribution/src/main: appended-resources/META-INF/LICENSE.vm assembly/src.xml

[da...@apache.org]

Author: dandiep
Date: Thu Apr  3 18:19:12 2008
New Revision: 644571

URL: http://svn.apache.org/viewvc?rev=644571&view=rev
Log:
Make the generated license include Mark Pilgrim's license.

Modified:
    incubator/abdera/java/branches/abdera-0.4.0-incubating/distribution/src/main/appended-resources/META-INF/LICENSE.vm
    incubator/abdera/java/branches/abdera-0.4.0-incubating/distribution/src/main/assembly/src.xml

Modified: incubator/abdera/java/branches/abdera-0.4.0-incubating/distribution/src/main/appended-resources/META-INF/LICENSE.vm
URL: http://svn.apache.org/viewvc/incubator/abdera/java/branches/abdera-0.4.0-incubating/distribution/src/main/appended-resources/META-INF/LICENSE.vm?rev=644571&r1=644570&r2=644571&view=diff
==============================================================================
--- incubator/abdera/java/branches/abdera-0.4.0-incubating/distribution/src/main/appended-resources/META-INF/LICENSE.vm (original)
+++ incubator/abdera/java/branches/abdera-0.4.0-incubating/distribution/src/main/appended-resources/META-INF/LICENSE.vm Thu Apr  3 18:19:12 2008
@@ -39,3 +39,26 @@
 #end
 #end
 
+Copyright (c) 2002-2005, Mark Pilgrim
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS'
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file

Modified: incubator/abdera/java/branches/abdera-0.4.0-incubating/distribution/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/branches/abdera-0.4.0-incubating/distribution/src/main/assembly/src.xml?rev=644571&r1=644570&r2=644571&view=diff
==============================================================================
--- incubator/abdera/java/branches/abdera-0.4.0-incubating/distribution/src/main/assembly/src.xml (original)
+++ incubator/abdera/java/branches/abdera-0.4.0-incubating/distribution/src/main/assembly/src.xml Thu Apr  3 18:19:12 2008
@@ -64,6 +64,7 @@
                 <exclude>**/var/journal</exclude>
                 <exclude>**/build.out*</exclude>
                 <exclude>STATUS</exclude>
+                <exclude>LICENSE</exclude>
             </excludes>
         </fileSet>
     </fileSets>