remm2004/03/30 06:48:55
Modified:.build.xml LICENSE
Added: .NOTICE
Log:
- Add NOTICE file is dists.
Revision ChangesPath
1.182 +14 -4 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- build.xml 30 Mar 2004 11:21:53 - 1.181
+++ build.xml 30 Mar 2004 14:48:54 - 1.182
@@ -1120,8 +1120,9 @@
!-- Copy the top-level documentation files --
copy todir=${tomcat.dist}
fileset dir=.
-include name=LICENSE/
include name=INSTALLING.txt/
+include name=LICENSE/
+include name=NOTICE/
include name=README.txt/
include name=RELEASE*/
include name=RUNNING.txt/
@@ -1344,6 +1345,8 @@
zipfileset dir=${tomcat.dist} prefix=${final.name}
includes=LICENSE /
zipfileset dir=${tomcat.dist} prefix=${final.name}
+ includes=NOTICE /
+ zipfileset dir=${tomcat.dist} prefix=${final.name}
includes=README.txt /
zipfileset dir=${tomcat.dist} prefix=${final.name}
includes=RELEASE-NOTES /
@@ -1361,6 +1364,8 @@
zipfileset dir=${tomcat.dist} prefix=${final.name}-embed
includes=LICENSE /
zipfileset dir=${tomcat.dist} prefix=${final.name}-embed
+ includes=NOTICE /
+ zipfileset dir=${tomcat.dist} prefix=${final.name}-embed
includes=README.txt /
zipfileset dir=${tomcat.dist} prefix=${final.name}-embed
includes=RELEASE-NOTES /
@@ -1374,6 +1379,8 @@
zipfileset dir=${tomcat.dist} prefix=${final.name}-deployer
includes=LICENSE /
zipfileset dir=${tomcat.dist} prefix=${final.name}-deployer
+ includes=NOTICE /
+ zipfileset dir=${tomcat.dist} prefix=${final.name}-deployer
includes=README.txt /
zipfileset dir=${tomcat.dist} prefix=${final.name}-deployer
includes=RELEASE-NOTES /
@@ -1399,7 +1406,7 @@
target name=package-tgz
fixcrlf srcdir=${tomcat.dist}
- includes=*.txt,LICENSE eol=lf/
+ includes=*.txt,LICENSE,NOTICE eol=lf/
fixcrlf srcdir=${tomcat.dist}/conf eol=lf/
tar longfile=gnu compression=gzip
tarfile=${tomcat.release}/v${version}/bin/${final.name}.tar.gz
@@ -1429,6 +1436,7 @@
include name=webapps/** /
include name=work/** /
include name=LICENSE /
+include name=NOTICE /
include name=README.txt /
include name=RELEASE-NOTES /
include name=RUNNING.txt /
@@ -1452,12 +1460,13 @@
target name=package-embed-tgz
fixcrlf srcdir=${tomcat.dist}
- includes=*.txt,LICENSE eol=lf/
+ includes=*.txt,LICENSE,NOTICE eol=lf/
fixcrlf srcdir=${tomcat.embed} includes=*.xml eol=lf/
tar longfile=gnu compression=gzip
tarfile=${tomcat.release}/v${version}/bin/${final.name}-embed.tar.gz
tarfileset dir=${tomcat.dist} prefix=${final.name}-embed
include name=LICENSE /
+include name=NOTICE /
include name=README.txt /
include name=RELEASE-NOTES /
/tarfileset
@@ -1469,12 +1478,13 @@
target name=package-deployer-tgz
fixcrlf srcdir=${tomcat.dist}
- includes=*.txt,LICENSE eol=lf/
+ includes=*.txt,LICENSE,NOTICE eol=lf/
fixcrlf srcdir=${tomcat.deployer} includes=*.xml eol=lf/
tar longfile=gnu compression=gzip
tarfile=${tomcat.release}/v${version}/bin/${final.name}-deployer.tar.gz
tarfileset dir=${tomcat.dist} prefix=${final.name}-deployer
include name=LICENSE /
+include name=NOTICE /
include name=README.txt /
include name=RELEASE-NOTES /
/tarfileset
1.3 +201 -61 jakarta-tomcat-5/LICENSE
Index: LICENSE
===
RCS file: /home/cvs/jakarta-tomcat-5/LICENSE,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LICENSE 24 Dec 2003 19:53:47 - 1.2
+++ LICENSE 30 Mar 2004 14:48:54 - 1.3
@@ -1,61 +1,201 @@
-/* = *
- * *
- * The Apache Software License, Version 1.1 *
- * *
- * Copyright (c) 1999, 2000 The Apache Software Foundation. *
- * All rights reserved.*
- * *
- *
