Merge 'reorganize jar files so that offline installation works' from Glauber

"We put the .jar files for cassandra and scylla into the top level of the
.tar directory, and the dependencies inside lib/ The classpath is able
to find the latter, but not ther former, and as a consequence we cannot
execute the commands in bin/ and tools/bin -> they will fail on missing
jars.

If we move all jars - including the ones we build - to lib/, then
everything works in a nice, self-contained manner.

Once we do that, we can also simplify the installation for .deb and .rpm
packages, since they already move the entire contents of lib/ into the
filesystem.

Tested by installing the resulting rpm and deb, as well as using
nodetool, sstableloader and cassandra-stress directly from the resulting
.tar package."

Reviewed-by: Takuya ASADA <[email protected]>
* 'offline' of https://github.com/glommer/scylla-tools-java:
  reorganize jar files so that offline installation works

Author: penberg

dist/debian/rules.mustache

@@ -23,20 +23,8 @@ install:
 	dh_installdirs
 	dh_install
 
-	# Copy in the jar and symlink to something stable
-	dh_install -p {{product}}-tools-core apache-cassandra-$(VERSION).jar \
-		usr/share/scylla/cassandra
-	dh_install apache-cassandra-thrift-$(VERSION).jar \
-		usr/share/scylla/cassandra
-	dh_install -p {{product}}-tools-core scylla-tools-$(VERSION).jar \
-		usr/share/scylla/cassandra
-
-	# Copy stress jars
-	dh_install stress.jar \
-		usr/share/scylla/cassandra
-
-	dh_link -p {{product}}-tools-core usr/share/scylla/cassandra/apache-cassandra-$(VERSION).jar \
-		usr/share/scylla/cassandra/apache-cassandra.jar
+	dh_link -p {{product}}-tools-core usr/share/scylla/cassandra/lib/apache-cassandra-$(VERSION).jar \
+		usr/share/scylla/cassandra/lib/apache-cassandra.jar
 
 # Build architecture-independent files here.
 binary-indep: build install

dist/redhat/scylla-tools.spec.mustache

@@ -70,13 +70,8 @@ install -m644 lib/*.zip $RPM_BUILD_ROOT%{_datadir}/scylla/cassandra/lib/
 install -d -m755 $RPM_BUILD_ROOT%{_docdir}/scylla/cassandra/licenses/
 install -m644 lib/licenses/* $RPM_BUILD_ROOT%{_docdir}/scylla/cassandra/licenses/
 
-install -m644 apache-cassandra-%{version}-%{release}.jar $RPM_BUILD_ROOT%{_datadir}/scylla/cassandra
-install -m644 apache-cassandra-thrift-%{version}-%{release}.jar $RPM_BUILD_ROOT%{_datadir}/scylla/cassandra
-install -m644 scylla-tools-%{version}-%{release}.jar $RPM_BUILD_ROOT%{_datadir}/scylla/cassandra
-install -m644 stress.jar $RPM_BUILD_ROOT%{_datadir}/scylla/cassandra
-
 cd $RPM_BUILD_ROOT
-ln -s %{_datadir}/scylla/cassandra/apache-cassandra-%{version}-%{release}.jar $RPM_BUILD_ROOT%{_datadir}/scylla/cassandra/apache-cassandra.jar
+ln -s %{_datadir}/scylla/cassandra/lib/apache-cassandra-%{version}-%{release}.jar $RPM_BUILD_ROOT%{_datadir}/scylla/cassandra/lib/apache-cassandra.jar
 
 %files
 %{_sysconfdir}/bash_completion.d/nodetool-completion
@@ -104,7 +99,6 @@ ln -s %{_datadir}/scylla/cassandra/apache-cassandra-%{version}-%{release}.jar $R
 %{_datadir}/scylla/cassandra/lib/*.jar
 %{_datadir}/scylla/cassandra/lib/*.zip
 %{_docdir}/scylla/cassandra/licenses
-%{_datadir}/scylla/cassandra/*.jar
 %{_bindir}/scylla-sstableloader
 
 %changelog

scripts/create-relocatable-package.py

@@ -51,10 +51,10 @@
 ar.add('tools')
 ar.add('lib')
 ar.add('doc')
-ar.add('build/apache-cassandra-{}.jar'.format(version), arcname='apache-cassandra-{}.jar'.format(version))
-ar.add('build/apache-cassandra-thrift-{}.jar'.format(version), arcname='apache-cassandra-thrift-{}.jar'.format(version))
-ar.add('build/scylla-tools-{}.jar'.format(version), arcname='scylla-tools-{}.jar'.format(version))
-ar.add('build/tools/lib/stress.jar', arcname='stress.jar')
+ar.add('build/apache-cassandra-{}.jar'.format(version), arcname='lib/apache-cassandra-{}.jar'.format(version))
+ar.add('build/apache-cassandra-thrift-{}.jar'.format(version), arcname='lib/apache-cassandra-thrift-{}.jar'.format(version))
+ar.add('build/scylla-tools-{}.jar'.format(version), arcname='lib/scylla-tools-{}.jar'.format(version))
+ar.add('build/tools/lib/stress.jar', arcname='lib/stress.jar')
 ar.add('README.asc')
 ar.add('CHANGES.txt')
 ar.add('NEWS.txt')