Author: eevans
Date: Tue Dec 14 01:46:34 2010
New Revision: 1048903
URL: http://svn.apache.org/viewvc?rev=1048903&view=rev
Log:
enable use of jna in debian packages
Patch by eevans and paul cannon for CASSANDRA-1689
Added:
cassandra/trunk/debian/default
Modified:
cassandra/trunk/debian/control
cassandra/trunk/debian/init
Modified: cassandra/trunk/debian/control
URL:
http://svn.apache.org/viewvc/cassandra/trunk/debian/control?rev=1048903&r1=1048902&r2=1048903&view=diff
==============================================================================
--- cassandra/trunk/debian/control (original)
+++ cassandra/trunk/debian/control Tue Dec 14 01:46:34 2010
@@ -11,6 +11,7 @@ Standards-Version: 3.8.3
Package: cassandra
Architecture: all
Depends: openjdk-6-jre-headless (>= 6b11) | java6-runtime, jsvc (>= 1.0),
libcommons-daemon-java (>= 1.0), adduser
+Recommends: libjna-java
Description: distributed storage system for structured data
Cassandra is a distributed (peer-to-peer) system for the management
and storage of structured data.
Added: cassandra/trunk/debian/default
URL:
http://svn.apache.org/viewvc/cassandra/trunk/debian/default?rev=1048903&view=auto
==============================================================================
--- cassandra/trunk/debian/default (added)
+++ cassandra/trunk/debian/default Tue Dec 14 01:46:34 2010
@@ -0,0 +1,7 @@
+# NOTICE: See also /etc/cassandra/cassandra-env.sh
+
+# EXTRA_CLASSPATH provides the means to extend Cassandra's classpath with
+# additional libraries. It is formatted as a colon-delimited list of
+# class directories and/or jar files. For example, to enable the
+# JMX-to-web bridge install libmx4j-java and uncomment the following.
+#EXTRA_CLASSPATH="/usr/share/java/mx4j-tools.jar"
Modified: cassandra/trunk/debian/init
URL:
http://svn.apache.org/viewvc/cassandra/trunk/debian/init?rev=1048903&r1=1048902&r2=1048903&view=diff
==============================================================================
--- cassandra/trunk/debian/init (original)
+++ cassandra/trunk/debian/init Tue Dec 14 01:46:34 2010
@@ -77,11 +77,14 @@ fi
#
classpath()
{
- cp=
+ cp="$EXTRA_CLASSPATH"
for j in /usr/share/$NAME/*.jar; do
[ "x$cp" = "x" ] && cp=$j || cp=$cp:$j
done
+ # use JNA if installed in standard location
+ [ -r /usr/share/java/jna.jar ] && cp="$cp:/usr/share/java/jna.jar"
+
# Include the conf directory for purposes of log4j-server.properties, and
# commons-daemon in support of the daemonization class.
printf "$cp:$CONFDIR:/usr/share/java/commons-daemon.jar"
