From 73444118d98732ff7d1b86592e6f45a4c61a9497 Mon Sep 17 00:00:00 2001
From: 0xboobface <0xboobface@gmail.com>
Date: Mon, 19 Nov 2018 14:04:24 +0100
Subject: [PATCH] Remove server files from assembly

---
 client/CHANGELOG.md               |  4 +++-
 client/pom.xml                    |  3 +++
 client/src/assembly/linux-jre.xml | 18 ++++++++++------
 client/src/assembly/linux.xml     | 36 +++++++++++++++++++++++++++++++
 client/src/assembly/macos-jre.xml | 18 ++++++++++------
 client/src/assembly/macos.xml     | 18 ++++++++++------
 client/src/assembly/win64-jre.xml | 18 ++++++++++------
 client/src/assembly/win64.xml     | 17 ++++++++++-----
 8 files changed, 102 insertions(+), 30 deletions(-)
 create mode 100644 client/src/assembly/linux.xml

diff --git a/client/CHANGELOG.md b/client/CHANGELOG.md
index 77721c25..6c9fc55b 100644
--- a/client/CHANGELOG.md
+++ b/client/CHANGELOG.md
@@ -1,4 +1,4 @@
-1.9.1
+1.10.0
 ========================
 * Fix: HMAC authentication didn't work for playing and downloading of a
   recording
@@ -8,6 +8,8 @@
 * Post-processing script is now run outside ot the recordings directory
   Make sure, you use absolute paths
 * Added setting to configure the directory structure for recordings
+* Split up client and server into separat packages. The server package
+  only depends on Java 1.8 and can be run with the 32-bit JRE, too.
 
 1.9.0
 ========================
diff --git a/client/pom.xml b/client/pom.xml
index 49927454..f5d7abd9 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -156,6 +156,7 @@
 									<goal>single</goal>
 								</goals>
 								<configuration>
+									<finalName>ctbrec-${project.version}</finalName>
 									<descriptors>
 										<descriptor>src/assembly/win64.xml</descriptor>
 										<descriptor>src/assembly/win64-jre.xml</descriptor>
@@ -188,6 +189,7 @@
 									<goal>single</goal>
 								</goals>
 								<configuration>
+									<finalName>ctbrec-${project.version}</finalName>
 									<descriptors>
 										<descriptor>src/assembly/linux.xml</descriptor>
 										<descriptor>src/assembly/linux-jre.xml</descriptor>
@@ -220,6 +222,7 @@
 									<goal>single</goal>
 								</goals>
 								<configuration>
+									<finalName>ctbrec-${project.version}</finalName>
 									<descriptors>
 										<descriptor>src/assembly/macos.xml</descriptor>
 										<descriptor>src/assembly/macos-jre.xml</descriptor>
diff --git a/client/src/assembly/linux-jre.xml b/client/src/assembly/linux-jre.xml
index a110eddf..597f89a2 100644
--- a/client/src/assembly/linux-jre.xml
+++ b/client/src/assembly/linux-jre.xml
@@ -12,12 +12,6 @@
 			<filtered>true</filtered>
 			<destName>ctbrec.sh</destName>
 		</file>
-		<file>
-			<source>${project.basedir}/src/assembly/server-linux-jre.sh</source>
-			<outputDirectory>ctbrec</outputDirectory>
-			<filtered>true</filtered>
-			<destName>server.sh</destName>
-		</file>
 		<file>
 			<source>${project.basedir}/src/main/resources/pp.sh</source>
 			<outputDirectory>ctbrec</outputDirectory>
@@ -26,6 +20,18 @@
 			<source>${project.build.directory}/${name.final}.jar</source>
 			<outputDirectory>ctbrec</outputDirectory>
 		</file>
+		<file>
+			<source>${project.basedir}/CHANGELOG.md</source>
+			<outputDirectory>ctbrec</outputDirectory>
+		</file>
+		<file>
+			<source>${project.basedir}/LICENSE.txt</source>
+			<outputDirectory>ctbrec</outputDirectory>
+		</file>
+		<file>
+			<source>${project.basedir}/README.md</source>
+			<outputDirectory>ctbrec</outputDirectory>
+		</file>
 	</files>
 	<fileSets>
 		<fileSet>
diff --git a/client/src/assembly/linux.xml b/client/src/assembly/linux.xml
new file mode 100644
index 00000000..b4a02e74
--- /dev/null
+++ b/client/src/assembly/linux.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly>
+	<id>linux</id>
+	<formats>
+		<format>zip</format>
+	</formats>
+	<includeBaseDirectory>false</includeBaseDirectory>
+	<files>
+		<file>
+			<source>${project.basedir}/src/assembly/ctbrec-linux.sh</source>
+			<outputDirectory>ctbrec</outputDirectory>
+			<filtered>true</filtered>
+			<destName>ctbrec.sh</destName>
+		</file>
+		<file>
+			<source>${project.basedir}/src/main/resources/pp.sh</source>
+			<outputDirectory>ctbrec</outputDirectory>
+		</file>
+		<file>
+			<source>${project.build.directory}/${name.final}.jar</source>
+			<outputDirectory>ctbrec</outputDirectory>
+		</file>
+		<file>
+			<source>${project.basedir}/CHANGELOG.md</source>
+			<outputDirectory>ctbrec</outputDirectory>
+		</file>
+		<file>
+			<source>${project.basedir}/LICENSE.txt</source>
+			<outputDirectory>ctbrec</outputDirectory>
+		</file>
+		<file>
+			<source>${project.basedir}/README.md</source>
+			<outputDirectory>ctbrec</outputDirectory>
+		</file>
+	</files>
+</assembly>
diff --git a/client/src/assembly/macos-jre.xml b/client/src/assembly/macos-jre.xml
index 972db8f3..4c80e155 100644
--- a/client/src/assembly/macos-jre.xml
+++ b/client/src/assembly/macos-jre.xml
@@ -12,12 +12,6 @@
 			<filtered>true</filtered>
 			<destName>ctbrec.sh</destName>
 		</file>
-		<file>
-			<source>${project.basedir}/src/assembly/server-macos-jre.sh</source>
-			<outputDirectory>ctbrec</outputDirectory>
-			<filtered>true</filtered>
-			<destName>server.sh</destName>
-		</file>
 		<file>
 			<source>${project.basedir}/src/main/resources/pp.sh</source>
 			<outputDirectory>ctbrec</outputDirectory>
@@ -26,6 +20,18 @@
 			<source>${project.build.directory}/${name.final}.jar</source>
 			<outputDirectory>ctbrec</outputDirectory>
 		</file>
+		<file>
+			<source>${project.basedir}/CHANGELOG.md</source>
+			<outputDirectory>ctbrec</outputDirectory>
+		</file>
+		<file>
+			<source>${project.basedir}/LICENSE.txt</source>
+			<outputDirectory>ctbrec</outputDirectory>
+		</file>
+		<file>
+			<source>${project.basedir}/README.md</source>
+			<outputDirectory>ctbrec</outputDirectory>
+		</file>
 	</files>
 	<fileSets>
 		<fileSet>
diff --git a/client/src/assembly/macos.xml b/client/src/assembly/macos.xml
index f9de5d0d..2d7f23d8 100644
--- a/client/src/assembly/macos.xml
+++ b/client/src/assembly/macos.xml
@@ -12,12 +12,6 @@
 			<filtered>true</filtered>
 			<destName>ctbrec.sh</destName>
 		</file>
-		<file>
-			<source>${project.basedir}/src/assembly/server-macos.sh</source>
-			<outputDirectory>ctbrec</outputDirectory>
-			<filtered>true</filtered>
-			<destName>server.sh</destName>
-		</file>
 		<file>
 			<source>${project.basedir}/src/main/resources/pp.sh</source>
 			<outputDirectory>ctbrec</outputDirectory>
@@ -26,5 +20,17 @@
 			<source>${project.build.directory}/${name.final}.jar</source>
 			<outputDirectory>ctbrec</outputDirectory>
 		</file>
+		<file>
+			<source>${project.basedir}/CHANGELOG.md</source>
+			<outputDirectory>ctbrec</outputDirectory>
+		</file>
+		<file>
+			<source>${project.basedir}/LICENSE.txt</source>
+			<outputDirectory>ctbrec</outputDirectory>
+		</file>
+		<file>
+			<source>${project.basedir}/README.md</source>
+			<outputDirectory>ctbrec</outputDirectory>
+		</file>
 	</files>
 </assembly>
diff --git a/client/src/assembly/win64-jre.xml b/client/src/assembly/win64-jre.xml
index e81eb163..ab8a92e0 100644
--- a/client/src/assembly/win64-jre.xml
+++ b/client/src/assembly/win64-jre.xml
@@ -10,12 +10,6 @@
 			<source>${project.build.directory}/ctbrec.exe</source>
 			<outputDirectory>ctbrec</outputDirectory>
 		</file>
-		<file>
-			<source>${project.basedir}/src/assembly/server-jre.bat</source>
-			<outputDirectory>ctbrec</outputDirectory>
-			<filtered>true</filtered>
-			<destName>server.bat</destName>
-		</file>
         <file>
 			<source>${project.basedir}/src/main/resources/pp.bat</source>
 			<outputDirectory>ctbrec</outputDirectory>
@@ -28,6 +22,18 @@
 			<source>${project.build.directory}/${name.final}.jar</source>
 			<outputDirectory>ctbrec</outputDirectory>
 		</file>
+		<file>
+			<source>${project.basedir}/CHANGELOG.md</source>
+			<outputDirectory>ctbrec</outputDirectory>
+		</file>
+		<file>
+			<source>${project.basedir}/LICENSE.txt</source>
+			<outputDirectory>ctbrec</outputDirectory>
+		</file>
+		<file>
+			<source>${project.basedir}/README.md</source>
+			<outputDirectory>ctbrec</outputDirectory>
+		</file>
 	</files>
 	<fileSets>
 		<fileSet>
diff --git a/client/src/assembly/win64.xml b/client/src/assembly/win64.xml
index 5cc92821..0147add3 100644
--- a/client/src/assembly/win64.xml
+++ b/client/src/assembly/win64.xml
@@ -10,11 +10,6 @@
 			<source>${project.build.directory}/ctbrec.exe</source>
 			<outputDirectory>ctbrec</outputDirectory>
 		</file>
-		<file>
-			<source>${project.basedir}/src/assembly/server.bat</source>
-			<outputDirectory>ctbrec</outputDirectory>
-			<filtered>true</filtered>
-		</file>
 		<file>
 			<source>${project.basedir}/src/main/resources/pp.bat</source>
 			<outputDirectory>ctbrec</outputDirectory>
@@ -27,5 +22,17 @@
 			<source>${project.build.directory}/${name.final}.jar</source>
 			<outputDirectory>ctbrec</outputDirectory>
 		</file>
+		<file>
+			<source>${project.basedir}/CHANGELOG.md</source>
+			<outputDirectory>ctbrec</outputDirectory>
+		</file>
+		<file>
+			<source>${project.basedir}/LICENSE.txt</source>
+			<outputDirectory>ctbrec</outputDirectory>
+		</file>
+		<file>
+			<source>${project.basedir}/README.md</source>
+			<outputDirectory>ctbrec</outputDirectory>
+		</file>
 	</files>
 </assembly>