merge w/ 0.6 branch

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@986151 13f79535-47bb-0310-9956-ffa450edef68

debian/cassandra.default

@@ -12,5 +12,9 @@ JVM_MAX_MEM="1G"
 # M to indicate kilobytes or megabytes respectively. 
 JVM_START_MEM="256"
 
+# Specifies the default port over which Cassandra will be available for
+# JMX connections.
+JMX_PORT="8080"
+
 # Specifies any additional arguments to the JVM.
 JVM_EXTRA_OPTS="-XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:SurvivorRatio=8 -XX:MaxTenuringThreshold=1 -XX:+HeapDumpOnOutOfMemoryError"

debian/init

@@ -20,6 +20,7 @@ CONFDIR=/etc/cassandra
 JSVC=/usr/bin/jsvc
 JVM_MAX_MEM="1G"
 JVM_START_MEM="128M"
+JMX_PORT="8080"
 
 # The first existing directory is used for JAVA_HOME
 JDK_DIRS="/usr/lib/jvm/java-6-sun /usr/lib/jvm/java-6-openjdk"
@@ -94,7 +95,7 @@ do_start()
         -Xmx$JVM_MAX_MEM \
         -Xms$JVM_START_MEM \
         -Dlog4j.configuration=log4j-server.properties \
-        -Dcom.sun.management.jmxremote.port=8080 \
+        -Dcom.sun.management.jmxremote.port=$JMX_PORT \
         -Dcom.sun.management.jmxremote.ssl=false \
         -Dcom.sun.management.jmxremote.authenticate=false \
         $JVM_EXTRA_OPTS \