natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge w/ 0.6 branch 

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@916431 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eric Evans 2010-02-25 20:01:50 +00:00
parent 8584c40ad5
commit b5807aa607
3 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.xml
View File

@ -42,7 +42,7 @@
<property name="test.name" value="*Test"/>
<property name="test.unit.src" value="${test.dir}/unit"/>
<property name="dist.dir" value="${build.dir}/dist"/>
<property name="version" value="0.6.0-beta1"/>
<property name="version" value="0.6.0-beta2"/>
<property name="final.name" value="${ant.project.name}-${version}"/>
<property name="ivy.version" value="2.1.0" />
<property name="ivy.url"

29
debian/cassandra.install vendored
View File

@ -3,17 +3,26 @@ conf/storage-conf.xml etc/cassandra
debian/cassandra.in.sh usr/share/cassandra
bin/cassandra usr/sbin
bin/cassandra-cli usr/bin
bin/nodeprobe usr/bin
bin/nodetool usr/bin
bin/clustertool usr/bin
lib/antlr-3.1.3.jar usr/share/cassandra
lib/avro-1.2.0-dev.jar usr/share/cassandra
lib/clhm-production.jar usr/share/cassandra
lib/commons-cli-1.1.jar usr/share/cassandra
lib/commons-collections-3.2.1.jar usr/share/cassandra
lib/commons-lang-2.4.jar usr/share/cassandra
lib/google-collect-1.0-rc1.jar usr/share/cassandra
lib/high-scale-lib.jar usr/share/cassandra
lib/jline-0.9.94.jar usr/share/cassandra
lib/json_simple-1.1.jar usr/share/cassandra
lib/libthrift-r894924.jar usr/share/cassandra
lib/log4j-1.2.15.jar usr/share/cassandra
lib/slf4j-api-1.5.8.jar usr/share/cassandra
lib/slf4j-log4j12-1.5.8.jar usr/share/cassandra
build/lib/jars/commons-cli-1.1.jar usr/share/cassandra
build/lib/jars/commons-codec-1.2.jar usr/share/cassandra
build/lib/jars/commons-collections-3.2.1.jar usr/share/cassandra
build/lib/jars/commons-httpclient-3.1.jar usr/share/cassandra
build/lib/jars/commons-lang-2.4.jar usr/share/cassandra
build/lib/jars/commons-logging-1.1.1.jar usr/share/cassandra
build/lib/jars/google-collections-1.0.jar usr/share/cassandra
build/lib/jars/hadoop-core-0.20.1.jar usr/share/cassandra
build/lib/jars/jackson-core-asl-1.4.0.jar usr/share/cassandra
build/lib/jars/jackson-mapper-asl-1.4.0.jar usr/share/cassandra
build/lib/jars/jline-0.9.94.jar usr/share/cassandra
build/lib/jars/json-simple-1.1.jar usr/share/cassandra
build/lib/jars/junit-4.6.jar usr/share/cassandra
build/lib/jars/log4j-1.2.14.jar usr/share/cassandra
build/lib/jars/slf4j-api-1.5.8.jar usr/share/cassandra
build/lib/jars/slf4j-log4j12-1.5.8.jar usr/share/cassandra

4
debian/init vendored
View File

@ -87,7 +87,7 @@ do_start()
-Dcom.sun.management.jmxremote.port=8080 \
-Dcom.sun.management.jmxremote.ssl=false \
-Dcom.sun.management.jmxremote.authenticate=false \
org.apache.cassandra.service.CassandraDaemon
org.apache.cassandra.thrift.CassandraDaemon
if ! is_running; then return 2; fi
}
@ -104,7 +104,7 @@ do_stop()
# other if a failure occurred
is_running || return 1
$JSVC -stop -home $JAVA_HOME -pidfile $PIDFILE \
org.apache.cassandra.service.CassandraJsvcDaemon
org.apache.cassandra.thrift.CassandraDaemon
is_running && return 2 || return 0
}