Author: jbellis
Date: Thu May 19 18:20:25 2011
New Revision: 1125041
URL: http://svn.apache.org/viewvc?rev=1125041&view=rev
Log:
fix CASSANDRA_HOME in debian packaging
patch by eevans; reviewed by Paul Cannon for CASSANDRA-2647
Modified:
cassandra/branches/cassandra-0.8.0/CHANGES.txt
cassandra/branches/cassandra-0.8.0/debian/cassandra.in.sh
cassandra/branches/cassandra-0.8.0/debian/cassandra.install
cassandra/branches/cassandra-0.8.0/debian/dirs
cassandra/branches/cassandra-0.8.0/debian/init
Modified: cassandra/branches/cassandra-0.8.0/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8.0/CHANGES.txt?rev=1125041&r1=1125040&r2=1125041&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8.0/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8.0/CHANGES.txt Thu May 19 18:20:25 2011
@@ -1,8 +1,8 @@
0.8.0-final
- * fix grammar warning and cqlsh regression from CASSANDRA-2622
+ * fix CQL grammar warning and cqlsh regression from CASSANDRA-2622
* add ant generate-cql-html target (CASSANDRA-2526)
* update CQL consistency levels (CASSANDRA-2566)
- * fix debian packaging runlevels (CASSANDRA-2481)
+ * debian packaging fixes (CASSANDRA-2481, 2647)
0.8.0-rc1
Modified: cassandra/branches/cassandra-0.8.0/debian/cassandra.in.sh
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8.0/debian/cassandra.in.sh?rev=1125041&r1=1125040&r2=1125041&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8.0/debian/cassandra.in.sh (original)
+++ cassandra/branches/cassandra-0.8.0/debian/cassandra.in.sh Thu May 19
18:20:25 2011
@@ -2,9 +2,15 @@
# The directory where Cassandra's configs live (required)
CASSANDRA_CONF=/etc/cassandra
+CASSANDRA_HOME=/usr/share/cassandra
+
# The java classpath (required)
CLASSPATH=$CASSANDRA_CONF
+for jar in /usr/share/cassandra/lib/*.jar; do
+ CLASSPATH=$CLASSPATH:$jar
+done
+
for jar in /usr/share/cassandra/*.jar; do
CLASSPATH=$CLASSPATH:$jar
done
Modified: cassandra/branches/cassandra-0.8.0/debian/cassandra.install
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8.0/debian/cassandra.install?rev=1125041&r1=1125040&r2=1125041&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8.0/debian/cassandra.install (original)
+++ cassandra/branches/cassandra-0.8.0/debian/cassandra.install Thu May 19
18:20:25 2011
@@ -9,5 +9,5 @@ bin/nodetool usr/bin
bin/json2sstable usr/bin
bin/sstable2json usr/bin
bin/sstablekeys usr/bin
-lib/*.jar usr/share/cassandra
+lib/*.jar usr/share/cassandra/lib
lib/licenses usr/share/doc/cassandra
Modified: cassandra/branches/cassandra-0.8.0/debian/dirs
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8.0/debian/dirs?rev=1125041&r1=1125040&r2=1125041&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8.0/debian/dirs (original)
+++ cassandra/branches/cassandra-0.8.0/debian/dirs Thu May 19 18:20:25 2011
@@ -1,4 +1,5 @@
usr/share/cassandra
+usr/share/cassandra/lib
usr/sbin
usr/bin
etc/cassandra
Modified: cassandra/branches/cassandra-0.8.0/debian/init
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8.0/debian/init?rev=1125041&r1=1125040&r2=1125041&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8.0/debian/init (original)
+++ cassandra/branches/cassandra-0.8.0/debian/init Thu May 19 18:20:25 2011
@@ -21,6 +21,7 @@ SCRIPTNAME=/etc/init.d/$NAME
CONFDIR=/etc/cassandra
JSVC=/usr/bin/jsvc
WAIT_FOR_START=10
+CASSANDRA_HOME=/usr/share/cassandra
# The first existing directory is used for JAVA_HOME if needed.
JVM_SEARCH_DIRS="/usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-sun"
@@ -80,6 +81,9 @@ fi
classpath()
{
cp="$EXTRA_CLASSPATH"
+ for j in /usr/share/$NAME/lib/*.jar; do
+ [ "x$cp" = "x" ] && cp=$j || cp=$cp:$j
+ done
for j in /usr/share/$NAME/*.jar; do
[ "x$cp" = "x" ] && cp=$j || cp=$cp:$j
done
