Permalink
Browse files

merge with 0.6 branch (post-850)

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@927954 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent afe2420 commit 06248ea220a752a2a07fe85191b03f306487eb18 Eric Evans committed Mar 26, 2010
Showing with 3,606 additions and 150 deletions.
  1. +5 −78 LICENSE.txt
  2. +0 −5 NEWS.txt
  3. +19 −4 NOTICE.txt
  4. +0 −2 README.txt
  5. +1 −3 bin/cassandra-cli.bat
  6. +0 −2 bin/cassandra.bat
  7. +1 −1 bin/cassandra.in.sh
  8. +11 −22 build.xml
  9. +6 −33 ivy.xml
  10. BIN lib/avro-1.3.1.jar
  11. BIN lib/commons-cli-1.1.jar
  12. BIN lib/commons-codec-1.2.jar
  13. BIN lib/commons-collections-3.2.1.jar
  14. BIN lib/commons-lang-2.4.jar
  15. BIN lib/google-collections-1.0.jar
  16. BIN lib/hadoop-core-0.20.1.jar
  17. BIN lib/jackson-core-asl-1.4.0.jar
  18. BIN lib/jackson-mapper-asl-1.4.0.jar
  19. BIN lib/jetty-6.1.21.jar
  20. BIN lib/jetty-util-6.1.21.jar
  21. BIN lib/jline-0.9.94.jar
  22. BIN lib/json-simple-1.1.jar
  23. BIN lib/jug-2.0.0.jar
  24. +27 −0 lib/licenses/antlr-3.1.3.txt
  25. +202 −0 lib/licenses/avro-1.3.1-dev.txt
  26. +202 −0 lib/licenses/clhm-production.txt
  27. +202 −0 lib/licenses/commons-cli-1.1.txt
  28. +202 −0 lib/licenses/commons-codec-1.2.txt
  29. +202 −0 lib/licenses/commons-collections-3.2.1.txt
  30. +202 −0 lib/licenses/commons-lang-2.4.txt
  31. +202 −0 lib/licenses/google-collections-1.0.txt
  32. +202 −0 lib/licenses/hadoop-core-0.20.1.txt
  33. +29 −0 lib/licenses/high-scale-lib.txt
  34. +202 −0 lib/licenses/jackson-core-asl-1.4.0.txt
  35. +202 −0 lib/licenses/jackson-mapper-asl-1.4.0.txt
  36. +202 −0 lib/licenses/jetty-6.1.21.txt
  37. +202 −0 lib/licenses/jetty-util-6.1.21.txt
  38. +33 −0 lib/licenses/jline-0.9.94.txt
  39. +202 −0 lib/licenses/json-simple-1.1.txt
  40. +202 −0 lib/licenses/jug-2.0.0.txt
  41. +202 −0 lib/licenses/libthrift-r917130.txt
  42. +202 −0 lib/licenses/log4j-1.2.14.txt
  43. +202 −0 lib/licenses/servlet-api-2.5-20081211.txt
  44. +20 −0 lib/licenses/slf4j-api-1.5.8.txt
  45. +20 −0 lib/licenses/slf4j-log4j12-1.5.8.txt
  46. BIN lib/log4j-1.2.14.jar
  47. BIN lib/servlet-api-2.5-20081211.jar
  48. BIN lib/slf4j-api-1.5.8.jar
  49. BIN lib/slf4j-log4j12-1.5.8.jar
View
@@ -202,81 +202,8 @@
limitations under the License.
-APACHE CASSANDRA THIRD-PARTY DEPENDENCIES
-
-Apache Cassandra includes convenience copies of a number of third-party
-dependencies that have separate copyright notices and license terms. Your
-use of these libraries is subject to the terms and conditions of the
-following licenses.
-
-For lib/clhm-production.jar:
-
-While developed outside the ASF, this project is also licensed under
-the Apache License 2.0. The full text of the Apache License 2.0 can be
-found at top of this file.
-
-See NOTICE.txt for the respective copyright notices of these libraries.
-
-
-For lib/antlr-3.1.3.jar:
-------------------------
-
-[The "BSD licence"]
-Copyright (c) 2003-2006 Terence Parr
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. 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.
- 3. The name of the author may not be used to endorse or promote products
- derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-
-
-For lib/high-scale-lib.jar:
----------------------------
-
-The person or persons who have associated work with this document (the
-"Dedicator" or "Certifier") hereby either (a) certifies that, to the best
-of his knowledge, the work of authorship identified is in the public
-domain of the country from which the work is published, or (b) hereby
-dedicates whatever copyright the dedicators holds in the work of
-authorship identified below (the "Work") to the public domain. A
-certifier, moreover, dedicates any copyright interest he may have in the
-associated work, and for these purposes, is described as a "dedicator"
-below.
-
-A certifier has taken reasonable steps to verify the copyright status of
-this work. Certifier recognizes that his good faith efforts may not
-shield him from liability if in fact the work certified is not in the
-public domain.
-
-Dedicator makes this dedication for the benefit of the public at large and
-to the detriment of the Dedicator's heirs and successors. Dedicator
-intends this dedication to be an overt act of relinquishment in perpetuity
-of all present and future rights under copyright law, whether vested or
-contingent, in the Work. Dedicator understands that such relinquishment of
-all rights includes the relinquishment of all rights to enforce (by
-lawsuit or otherwise) those copyrights in the Work.
-
-Dedicator recognizes that, once placed in the public domain, the Work may
-be freely reproduced, distributed, transmitted, used, modified, built
-upon, or otherwise exploited by anyone for any purpose, commercial or
-non-commercial, and in any way, including by methods that have not yet
-been invented or conceived.
+THIRD-PARTY DEPENDENCIES
+========================
+Convenience copies of some third-party dependencies are distributed with
+Apache Cassandra as Java jar files in lib/. Licensing information for
+these files can be found in the lib/licenses directory.
View
@@ -63,11 +63,6 @@ JMX metrics
Installation/Upgrade
--------------------
- - Where possible, Ivy (http://ant.apache.org/ivy/) is now being used to
- dynamically retrieve third-party dependencies that were previously
- shipped in lib/. If you are installing from binary distribution then
- you will need to install Ant (http://ant.apache.org/), and invoke
- `ant ivy-retrieve' in order to download needed dependencies.
- 0.6 network traffic is not compatible with earlier versions. You
will need to shut down all your nodes at once, upgrade, then restart.
View
@@ -1,16 +1,31 @@
Apache Cassandra
-Copyright 2009 The Apache Software Foundation
+Copyright 2009, 2010 The Apache Software Foundation
This product includes software developed by The Apache Software
Foundation (http://www.apache.org/).
-Parser generation is provided by ANTLR, (http://www.antlr.org/).
-Copyright (c) 2003-2006 Terence Parr
-
Some alternate data structures provided by high-scale-lib from
http://sourceforge.net/projects/high-scale-lib/.
Written by Cliff Click and released as Public Domain.
Some alternate data structures provided by concurrentlinkedhashmap
from http://code.google.com/p/concurrentlinkedhashmap/.
Copyright 2009 Benjamin Manes
+
+Alternative collection types provided by google-collections from
+http://code.google.com/p/google-collections/.
+Copyright (C) 2007 Google Inc.
+
+JSON (de)serialization provided by jackson (http://jackson.codehaus.org).
+Copyright (C) 2010 Tatu Saloranta and others.
+
+Alternative JSON (de)serialization by json-simple from
+(http://code.google.com/p/json-simple).
+Copyright (C) 2009 Fang Yidong and Chris Nokleberg
+
+This product includes the Jetty HTTP server
+(http://jetty.codehaus.org/jetty/).
+Copyright 1995-2006 Mort Bay Consulting Pty Ltd
+
+Alternative UUID support provided by Jug (http://jug.safehaus.org/).
+Copyright (c) 2002- Tatu Saloranta.
View
@@ -15,7 +15,6 @@ For more information see http://incubator.apache.org/cassandra
Requirements
------------
* Java >= 1.6 (OpenJDK and Sun have been tested)
- * Apache Ant >= 1.7 (http://ant.apache.org/)
Getting started
---------------
@@ -29,7 +28,6 @@ and running, and demonstrate some simple reads and writes.
* sudo chown -R `whoami` /var/log/cassandra
* sudo mkdir -p /var/lib/cassandra
* sudo chown -R `whoami` /var/lib/cassandra
- * ant ivy-retrieve
Note: The sample configuration files in conf/ determine the file-system
locations Cassandra uses for logging and data storage. You are free to
View
@@ -26,8 +26,6 @@ set CLASSPATH=
REM For each jar in the CASSANDRA_HOME lib directory call append to build the CLASSPATH variable.
for %%i in (%CASSANDRA_HOME%\lib\*.jar) do call :append %%~fi
-REM In developer mode, we need to include the ivy downloaded jars.
-for %%i in (%CASSANDRA_HOME%\build\lib\jars\*.jar) do call :append %%~fi
goto okClasspath
:append
@@ -50,4 +48,4 @@ pause
:finally
-ENDLOCAL
+ENDLOCAL
View
@@ -48,8 +48,6 @@ set CLASSPATH=
REM For each jar in the CASSANDRA_HOME lib directory call append to build the CLASSPATH variable.
for %%i in (%CASSANDRA_HOME%\lib\*.jar) do call :append %%~fi
-REM In developer mode, we need to include the ivy downloaded jars.
-for %%i in (%CASSANDRA_HOME%\build\lib\jars\*.jar) do call :append %%~fi
goto okClasspath
:append
View
@@ -32,7 +32,7 @@ cassandra_bin=$cassandra_home/build/classes
# The java classpath (required)
CLASSPATH=$CASSANDRA_CONF:$cassandra_bin
-for jar in $cassandra_home/lib/*.jar $cassandra_home/build/lib/jars/*.jar; do
+for jar in $cassandra_home/lib/*.jar; do
CLASSPATH=$CLASSPATH:$jar
done
View
@@ -67,16 +67,19 @@
<!--
Add all the dependencies.
-->
+ <path id="autoivy.classpath">
+ <fileset dir="${build.dir.lib}">
+ <include name="**/*.jar" />
+ </fileset>
+ <pathelement location="${build.dir}/ivy-${ivy.version}.jar"/>
+ </path>
<path id="cassandra.classpath">
<pathelement location="${cobertura.classes.dir}"/>
<pathelement location="${build.classes}"/>
<fileset dir="${build.lib}">
<include name="**/*.jar" />
</fileset>
- <fileset dir="${build.dir.lib}">
- <include name="**/*.jar" />
- </fileset>
- <pathelement location="${build.dir}/ivy-${ivy.version}.jar"/>
+ <path refid="autoivy.classpath" />
</path>
<path id="rat.classpath">
<fileset dir="${build.dir.lib}">
@@ -145,22 +148,12 @@
<mkdir dir="${build.dir.lib}"/>
<taskdef resource="org/apache/ivy/ant/antlib.xml"
uri="antlib:org.apache.ivy.ant"
- classpathref="cassandra.classpath"/>
+ classpathref="autoivy.classpath"/>
<property name="ivy.initialized" value="true"/>
</target>
- <target name="ivy-retrieve" depends="ivy-init">
- <ivy:retrieve type="jar,source" conf="default" sync="true"
- pattern="${build.dir.lib}/[type]s/[artifact]-[revision].[ext]" />
- </target>
-
- <target name="ivy-retrieve-build" depends="ivy-init,ivy-retrieve">
- <ivy:retrieve type="jar,source" conf="build" sync="true"
- pattern="${build.dir.lib}/[type]s/[artifact]-[revision].[ext]" />
- </target>
-
- <target name="ivy-retrieve-qa" depends="ivy-init,ivy-retrieve">
- <ivy:retrieve type="jar,source" conf="qa" sync="true"
+ <target name="ivy-retrieve-build" depends="ivy-init">
+ <ivy:retrieve type="jar,source" sync="true"
pattern="${build.dir.lib}/[type]s/[artifact]-[revision].[ext]" />
</target>
@@ -304,10 +297,6 @@
<include name="*.txt" />
</fileset>
</copy>
- <copy todir="${dist.dir}">
- <fileset file="build.xml" />
- <fileset file="ivy.xml" />
- </copy>
<tar compression="gzip" longfile="gnu"
destfile="${build.dir}/${final.name}-bin.tar.gz">
@@ -439,7 +428,7 @@
<!--
License audit tool
-->
- <target name="rat-init" depends="ivy-retrieve-qa">
+ <target name="rat-init" depends="ivy-retrieve-build">
<typedef resource="org/apache/rat/anttasks/antlib.xml"
uri="antlib:org.apache.rat.anttasks">
<classpath refid="rat.classpath" />
View
39 ivy.xml
@@ -19,40 +19,13 @@
<ivy-module version="2.0">
<info organisation="apache-cassandra" module="cassandra"/>
- <configurations defaultconfmapping="default">
- <conf name="default"/>
- <conf name="build" extends="default" />
- <conf name="qa" extends="default" />
- </configurations>
-
<dependencies>
- <!-- for hadoop -->
- <dependency org="commons-logging" name="commons-logging" rev="1.1.1"/>
- <dependency org="org.apache.mahout.hadoop" name="hadoop-core" rev="0.20.1"/>
- <dependency org="commons-httpclient" name="commons-httpclient" rev="3.1"/>
-
- <dependency org="org.apache.hadoop" name="avro" rev="1.3.0"/>
-
- <dependency org="com.google.collections" name="google-collections"
- rev="1.0"/>
- <dependency org="commons-cli" name="commons-cli" rev="1.2"/>
- <dependency org="commons-collections" name="commons-collections"
- rev="3.2.1"/>
- <dependency org="commons-lang" name="commons-lang" rev="2.5"/>
- <dependency org="jline" name="jline" rev="0.9.94"/>
- <dependency org="org.slf4j" name="slf4j-api" rev="1.5.11"/>
- <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.5.11"/>
- <dependency org="com.googlecode.json-simple" name="json-simple" rev="1.1"/>
- <dependency org="junit" name="junit" rev="4.8.1" conf="build->default" />
-
- <dependency org="org.apache.rat" name="apache-rat" rev="0.6"
- conf="qa->default"/>
- <dependency org="org.mortbay.jetty" name="jetty" rev="6.1.21"/>
-
- <dependency org="org.safehaus.jug" name="jug" rev="2.0.0">
- <!-- I can't figure out how to tell ivy to grab the classifier=asl version of this lib, so I force it. -->
- <artifact name="jug" type="jar" ext="jar" url="http://repo1.maven.org/maven2/org/safehaus/jug/jug/2.0.0/jug-2.0.0-asl.jar"/>
- </dependency>
+ <!-- FIXME: paranamer can be dropped after we're depending on avro
+ (since it depends on them). -->
+ <dependency org="com.thoughtworks.paranamer"
+ name="paranamer-ant" rev="2.1"/>
+ <dependency org="junit" name="junit" rev="4.6" />
+ <dependency org="org.apache.rat" name="apache-rat" rev="0.6" />
</dependencies>
</ivy-module>
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
@@ -0,0 +1,27 @@
+
+Copyright (c) 2003-2006 Terence Parr
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. 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.
+ 3. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+
Oops, something went wrong.

0 comments on commit 06248ea

Please sign in to comment.