merge from 0.3 branch

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@796574 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Ellis 2009-07-21 23:03:06 +00:00
parent 878991bb32
commit 6441803ba1
2 changed files with 17 additions and 69 deletions

View File

@ -1,65 +1,10 @@
Apache Cassandra
Copyright 2009 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
This product includes software developed by The Apache Software
Foundation (http://www.apache.org/).
From Lucene's notice file:
Apache Lucene
Copyright 2006 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
The snowball stemmers in
contrib/snowball/src/java/net/sf/snowball
were developed by Martin Porter and Richard Boulton.
The full snowball package is available from
http://snowball.tartarus.org/
From Groovy's notice file:
=========================================================================
== NOTICE file corresponding to the section 4 d of ==
== the Apache License, Version 2.0, ==
== in this case for the Groovy Language distribution. ==
=========================================================================
Groovy Language
Copyright 2003-2007 The respective authors and developers
Developers and Contributors are listed in the project POM file
This product includes software developed by
The Groovy community (http://groovy.codehaus.org/).
From Thrift's notice file:
Apache Thrift
Copyright 2006-2009 The Apache Software Foundation, et al.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Some files in this distribution are distributed under different terms
from the rest of Apache Thrift. Please see individual files for
license information.
In addition, the following unlabelled files are distributed under
specific terms. Please see the "doc" directory for the text of their
licenses.
lib/rb/setup.rb: GNU Lesser General Public License 2.1 (lgpl-2.1.txt)
lib/ocaml/OCamlMakefile: GNU Lesser General Public License 2.1 (lgpl-2.1.txt)
lib/ocaml/README-OCamlMakefile: GNU Lesser General Public License 2.1 (lgpl-2.1.txt)
lib/erl/build/beamver: MIT License (otp-base-license.txt)
lib/erl/build/buildtargets.mk: MIT License (otp-base-license.txt)
lib/erl/build/colors.mk: MIT License (otp-base-license.txt)
lib/erl/build/docs.mk: MIT License (otp-base-license.txt)
lib/erl/build/mime.types: MIT License (otp-base-license.txt)
lib/erl/build/otp.mk: MIT License (otp-base-license.txt)
lib/erl/build/otp_subdir.mk: MIT License (otp-base-license.txt)
lib/erl/build/raw_test.mk: MIT License (otp-base-license.txt)
lib/erl/src/Makefile: MIT License (otp-base-license.txt)
This product includes software developed by The Groovy community
(http://groovy.codehaus.org/).
Copyright 2003-2007 The respective authors and developers.
Developers and Contributors are listed in the project POM file

View File

@ -148,18 +148,21 @@
The jar target makes cassandra.jar output.
-->
<target name="jar" depends="build">
<jar jarfile="${build.dir}/${final.name}.jar"
basedir="${build.classes}">
<manifest>
<mkdir dir="${build.classes}/META-INF"/>
<copy file="LICENSE.txt" tofile="${build.classes}/META-INF/LICENSE.txt"/>
<copy file="NOTICE.txt" tofile="${build.classes}/META-INF/NOTICE.txt"/>
<jar jarfile="${build.dir}/${final.name}.jar"
basedir="${build.classes}">
<manifest>
<!-- <section name="org/apache/cassandra/infrastructure"> -->
<attribute name="Implementation-Title" value="Cassandra"/>
<attribute name="Implementation-Version" value="${version}"/>
<attribute name="Implementation-Vendor" value="Facebook"/>
<attribute name="Premain-Class" value="org.apache.cassandra.infrastructure.continuations.CAgent"/>
<attribute name="Implementation-Vendor" value="Apache"/>
<attribute name="Premain-Class" value="org.apache.cassandra.infrastructure.continuations.CAgent"/>
<!-- </section> -->
</manifest>
</jar>
</target>
</manifest>
</jar>
</target>
<!-- creates a release tarball -->
<target name="release" depends="jar,javadoc">