merge from 0.3 branch

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@780687 13f79535-47bb-0310-9956-ffa450edef68
yuanhui-yang · Jun 1, 2009 · d800250 · d800250
1 parent 04dcee0
commit d800250
Show file tree

Hide file tree

Showing 13 changed files with 230 additions and 11 deletions.
diff --git a/NOTICE.txt b/NOTICE.txt
@@ -1,2 +1,63 @@
 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)
diff --git a/README.txt b/README.txt
@@ -81,11 +81,11 @@ which in turn is associated with a table (Table1). In the example above,
 we set the value 'John' in the 'first' column for key 'jsmith'.
 
 For more information on the Cassandra data model be sure to checkout 
-http://cwiki.apache.org/confluence/display/CSDR/Data+Model
+http://wiki.apache.org/cassandra/DataModel
 
 Wondering where to go from here? 
 
-  * The wiki (http://cwiki.apache.org/confluence/display/CSDR) is the 
+  * The wiki (http://wiki.apache.org/cassandra/) is the 
     best source for additional information.
   * Join us in #cassandra on irc.freenode.net and ask questions.
   * Subscribe to the Users mailing list by sending a mail to

diff --git a/bin/cassandra b/bin/cassandra
@@ -1,28 +1,26 @@
 #!/bin/sh
-
-
-# OPTIONS:
-#   -f: start in foreground
-#   -p <filename>: log the pid to a file (useful to kill it later)
-
-
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
 # regarding copyright ownership.  The ASF licenses this file
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
 
+# OPTIONS:
+#   -f: start in foreground
+#   -p <filename>: log the pid to a file (useful to kill it later)
+
+
 if [ "x$CASSANDRA_INCLUDE" = "x" ]; then
     for include in /usr/share/cassandra/cassandra.in.sh \
                    /usr/local/share/cassandra/cassandra.in.sh \

diff --git a/bin/cassandra-cli b/bin/cassandra-cli
@@ -1,5 +1,22 @@
 #!/bin/sh
 
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
 classpath()
 {
     cassandra_home=`dirname $0`/..

diff --git a/bin/cassandra.in.sh b/bin/cassandra.in.sh
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 
 cassandra_home=`dirname $0`/..
 

diff --git a/bin/stop-server b/bin/stop-server
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
 echo "please read the stop-server script before use"
 
 # if you are using the cassandra start script with -p, this

diff --git a/conf/log4j.properties b/conf/log4j.properties
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # for production, you should probably set the root to INFO
 # and the pattern to %c instead of %l.  (%l is slower.)
 

diff --git a/interface/cassandra.thrift b/interface/cassandra.thrift
@@ -1,4 +1,19 @@
 #!/usr/local/bin/thrift --java --php --py
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 #
 # Interface definition for Cassandra Service

diff --git a/test/cassandra.in.sh b/test/cassandra.in.sh
@@ -1,3 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 cassandra_home=`dirname $0`/..
 

diff --git a/test/conf/log4j.properties b/test/conf/log4j.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
 log4j.rootLogger=DEBUG,R
 
 # rolling log file ("system.log

diff --git a/test/system/__init__.py b/test/system/__init__.py
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 import os, sys, time, signal
 
 __all__ = ['root', 'client']

diff --git a/test/system/stress.py b/test/system/stress.py
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # nosetests --tests=test.stress:Stress.ten_million_inserts
 
 from hashlib import md5

diff --git a/test/system/test_server.py b/test/system/test_server.py
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # to run a single test, run from trunk/:
 # PYTHONPATH=test nosetests --tests=system.test_server:TestMutations.test_empty_range