Skip to content

Commit

Permalink
Add support for 1.0. Resolves cassandra-rb#120.
Browse files Browse the repository at this point in the history
  • Loading branch information
Robert Jackson committed Oct 8, 2011
1 parent b9cef0d commit 096a262
Show file tree
Hide file tree
Showing 15 changed files with 3,744 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ PATH
cassandra (0.12.1)
json
rake
simple_uuid (>= 0.1.0)
simple_uuid (>= 0.2.0)
thrift_client (>= 0.7.0)

GEM
Expand Down
3 changes: 2 additions & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ end
CassandraBinaries = {
'0.6' => 'http://archive.apache.org/dist/cassandra/0.6.13/apache-cassandra-0.6.13-bin.tar.gz',
'0.7' => 'http://archive.apache.org/dist/cassandra/0.7.9/apache-cassandra-0.7.9-bin.tar.gz',
'0.8' => 'http://archive.apache.org/dist/cassandra/0.8.6/apache-cassandra-0.8.6-bin.tar.gz'
'0.8' => 'http://archive.apache.org/dist/cassandra/0.8.6/apache-cassandra-0.8.6-bin.tar.gz',
'1.0' => 'http://archive.apache.org/dist/cassandra/1.0.0/apache-cassandra-1.0.0-rc2-bin.tar.gz'
}

CASSANDRA_HOME = ENV['CASSANDRA_HOME'] || "#{ENV['HOME']}/cassandra"
Expand Down
41 changes: 41 additions & 0 deletions conf/1.0/cassandra.in.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# 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.

if [ "x$CASSANDRA_HOME" = "x" ]; then
CASSANDRA_HOME=`dirname $0`/..
fi

# The directory where Cassandra's configs live (required)
if [ "x$CASSANDRA_CONF" = "x" ]; then
CASSANDRA_CONF=$CASSANDRA_HOME/conf
fi

# This can be the path to a jar file, or a directory containing the
# compiled classes. NOTE: This isn't needed by the startup script,
# it's just used here in constructing the classpath.
cassandra_bin=$CASSANDRA_HOME/build/classes/main
cassandra_bin=$cassandra_bin:$CASSANDRA_HOME/build/classes/thrift
#cassandra_bin=$cassandra_home/build/cassandra.jar

# JAVA_HOME can optionally be set here
#JAVA_HOME=/usr/local/jdk6

# The java classpath (required)
CLASSPATH=$CASSANDRA_CONF:$cassandra_bin

for jar in $CASSANDRA_HOME/lib/*.jar; do
CLASSPATH=$CLASSPATH:$jar
done
Loading

0 comments on commit 096a262

Please sign in to comment.