Merge "Support Ubuntu 14.04LTS" from Takuya

debian/changelog

@@ -0,0 +1,5 @@
+scylla-jmx (0.10-1) unstable; urgency=medium
+
+  * Initial release.
+
+ -- Takuya ASADA <syuu@scylladb.com>  Mon, 24 Aug 2015 09:22:55 +0000

debian/compat

@@ -0,0 +1 @@
+9

debian/control

@@ -0,0 +1,13 @@
+Source: scylla-jmx
+Maintainer: Takuya ASADA <syuu@scylladb.com>
+Homepage: http://scylladb.com
+Section: database
+Priority: optional
+Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 9), maven, openjdk-7-jdk
+
+Package: scylla-jmx
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-7-jre-headless, scylla-server
+Description: Scylla JMX server binaries 
+ Scylla is a highly scalable, eventually consistent, distributed, partitioned row DB.

debian/copyright

@@ -0,0 +1,12 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Scylla DB
+Upstream-Contact: http://www.scylladb.com/
+Source: https://github.com/scylladb/scylla-jmx
+
+Files: *
+Copyright: Copyright (C) 2015 ScyllaDB
+License: AGPL-3.0
+
+Files: debian/*
+Copyright: Copyright (C) 2015 ScyllaDB
+License: AGPL-3.0

debian/rules

@@ -0,0 +1,27 @@
+#!/usr/bin/make -f
+
+DOC = $(CURDIR)/debian/scylla-jmx/usr/share/doc/scylla-jmx
+DEST = $(CURDIR)/debian/scylla-jmx/usr/lib/scylla/jmx
+
+override_dh_auto_build:
+	mvn install
+
+override_dh_auto_clean:
+	rm -rf target
+
+override_dh_auto_install:
+	mkdir -p $(CURDIR)/debian/scylla-jmx/etc/default/ && \
+	cp $(CURDIR)/dist/common/sysconfig/scylla-jmx  \
+		$(CURDIR)/debian/scylla-jmx/etc/default/
+
+	mkdir -p $(DOC) && \
+	cp $(CURDIR)/*.md $(DOC)
+	cp $(CURDIR)/NOTICE $(DOC)
+	cp $(CURDIR)/LICENSE.AGPL $(DOC)
+
+	mkdir -p $(DEST)
+	cp $(CURDIR)/dist/common/scripts/* $(DEST)
+	cp $(CURDIR)/target/urchin-mbean-1.0.jar $(DEST)
+
+%:
+	dh $@

debian/scylla-jmx.upstart

@@ -0,0 +1,22 @@
+# scylla-jmx - ScyllaDB
+#
+# ScyllaDB
+
+description	"ScyllaDB jmx"
+
+start on starting scylla-server
+stop on runlevel [!2345]
+
+respawn
+respawn limit 10 5
+umask 022
+
+expect fork
+
+console log
+
+script
+    . /etc/default/scylla-jmx
+    export JMX_LOCAL_PORT
+    /usr/lib/scylla/jmx/jmx_run
+end script

dist/common/scripts/jmx_run

@@ -2,4 +2,4 @@
 
 args="-Djava.net.preferIPv4Stack=true -Dcom.sun.management.jmxremote.port=$JMX_LOCAL_PORT  -Dcom.sun.management.jmxremote.rmi.port=$JMX_LOCAL_PORT -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"
 
-exec /usr/lib/jvm/jre-1.8.0/bin/java $args -jar /usr/lib/scylla/jmx/urchin-mbean-1.0.jar
+exec java $args -jar /usr/lib/scylla/jmx/urchin-mbean-1.0.jar

dist/redhat/scylla-jmx.spec.in

@@ -9,8 +9,8 @@ URL:            http://www.scylladb.com/
 Source0:        %{name}-@@VERSION@@-@@RELEASE@@.tar
 
 BuildArch:      noarch
-BuildRequires:  maven java-1.8.0-openjdk-devel systemd-units
-Requires:       java-1.8.0-openjdk scylla-server
+BuildRequires:  maven systemd-units java-devel
+Requires:       scylla-server java-headless
 
 %description
 
@@ -20,7 +20,7 @@ Requires:       java-1.8.0-openjdk scylla-server
 
 
 %build
-env JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk mvn install
+mvn install
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -28,12 +28,12 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/
 mkdir -p $RPM_BUILD_ROOT%{_unitdir}
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/scylla/
 
-install -m644 dist/redhat/sysconfig/scylla-jmx $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/
+install -m644 dist/common/sysconfig/scylla-jmx $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/
 install -m644 dist/redhat/systemd/scylla-jmx.service $RPM_BUILD_ROOT%{_unitdir}/
 install -d -m755 $RPM_BUILD_ROOT%{_prefix}/lib/scylla
 install -d -m755 $RPM_BUILD_ROOT%{_prefix}/lib/scylla/jmx
 install -m644 target/urchin-mbean-1.0.jar $RPM_BUILD_ROOT%{_prefix}/lib/scylla/jmx/
-install -m755 dist/redhat/scripts/* $RPM_BUILD_ROOT%{_prefix}/lib/scylla/jmx
+install -m755 dist/common/scripts/* $RPM_BUILD_ROOT%{_prefix}/lib/scylla/jmx
 
 %pre
 /usr/sbin/groupadd scylla 2> /dev/null || :

dist/ubuntu/build_deb.sh

@@ -0,0 +1,10 @@
+#!/bin/sh -e
+
+if [ ! -e dist/ubuntu/build_deb.sh ]; then
+    echo "run build_deb.sh in top of scylla dir"
+    exit 1
+fi
+
+sudo apt-get -y install debhelper maven openjdk-7-jdk
+
+debuild -r fakeroot --no-tgz-check -us -uc