svn commit: r1160459 - in /cassandra/branches/cassandra-0.8: CHANGES.txt debian/cassandra.in.sh redhat/cassandra.in.sh

[jb...@apache.org]

Author: jbellis
Date: Mon Aug 22 21:54:34 2011
New Revision: 1160459

URL: http://svn.apache.org/viewvc?rev=1160459&view=rev
Log:
avoid including cwd in classpath for deb and rpm packages
patch by Wojciech Meler and Paul Cannon for CASSANDRA-2881

Modified:
    cassandra/branches/cassandra-0.8/CHANGES.txt
    cassandra/branches/cassandra-0.8/debian/cassandra.in.sh
    cassandra/branches/cassandra-0.8/redhat/cassandra.in.sh

Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1160459&r1=1160458&r2=1160459&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Mon Aug 22 21:54:34 2011
@@ -17,7 +17,8 @@
    on create/update of the ColumnFamily and CQL 'ALTER' statement (CASSANDRA-3036)
  * return an InvalidRequestException if an indexed column is assigned
    a value larger than 64KB (CASSANDRA-3057)
- * fix of numeric-only and string column names handling in CLI "drop index" (CASSANDRA-3054)
+ * fix of numeric-only and string column names handling in CLI "drop index" 
+   (CASSANDRA-3054)
  * prune index scan resultset back to original request for lazy
    resultset expansion case (CASSANDRA-2964)
  * (Hadoop) fail jobs when Cassandra node has failed but TaskTracker
@@ -27,6 +28,7 @@
  * avoid retaining references to dropped CFS objects in 
    CompactionManager.estimatedCompactions (CASSANDRA-2708)
  * expose rpc timeouts per host in MessagingServiceMBean (CASSANDRA-2941)
+ * avoid including cwd in classpath for deb and rpm packages (CASSANDRA-2881)
 
 
 0.8.4

Modified: cassandra/branches/cassandra-0.8/debian/cassandra.in.sh
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/debian/cassandra.in.sh?rev=1160459&r1=1160458&r2=1160459&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/debian/cassandra.in.sh (original)
+++ cassandra/branches/cassandra-0.8/debian/cassandra.in.sh Mon Aug 22 21:54:34 2011
@@ -5,7 +5,11 @@ CASSANDRA_CONF=/etc/cassandra
 CASSANDRA_HOME=/usr/share/cassandra
 
 # The java classpath (required)
-CLASSPATH=$CASSANDRA_CONF
+if [ -n "$CLASSPATH" ]; then
+    CLASSPATH=$CLASSPATH:$CASSANDRA_CONF
+else
+    CLASSPATH=$CASSANDRA_CONF
+fi
 
 for jar in /usr/share/cassandra/lib/*.jar; do
     CLASSPATH=$CLASSPATH:$jar

Modified: cassandra/branches/cassandra-0.8/redhat/cassandra.in.sh
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/redhat/cassandra.in.sh?rev=1160459&r1=1160458&r2=1160459&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/redhat/cassandra.in.sh (original)
+++ cassandra/branches/cassandra-0.8/redhat/cassandra.in.sh Mon Aug 22 21:54:34 2011
@@ -2,11 +2,16 @@
 # The directory where Cassandra's configs live (required)
 CASSANDRA_CONF=/etc/cassandra/conf
 
+# The java classpath (required)
+if [ -n "$CLASSPATH" ]; then
+	CLASSPATH=$CLASSPATH:$CASSANDRA_CONF
+else
+	CLASSPATH=$CASSANDRA_CONF
+fi
+
 # use JNA if installed in standard location
 [ -r /usr/share/java/jna.jar ] && CLASSPATH="$CLASSPATH:/usr/share/java/jna.jar"
 
-# The java classpath (required)
-CLASSPATH=$CLASSPATH:$CASSANDRA_CONF
 
 for jar in /usr/share/cassandra/lib/*.jar; do
     CLASSPATH=$CLASSPATH:$jar