other pom cleanups:

- auto-extract bundled jre
- auto-build zip archive
- only build jar installer for linux
- only include icons where necessary

13 files changed, 97 insertions, 218 deletions

diff --git a/pdf-over-gui/src/main/resources/izpack/ManifestEntries.mf b/pdf-over-gui/src/main/resources/izpack-linux/ManifestEntries.mf
index 37a0cdce..37a0cdce 100644
--- a/pdf-over-gui/src/main/resources/izpack/ManifestEntries.mf
+++ b/pdf-over-gui/src/main/resources/izpack-linux/ManifestEntries.mf
diff --git a/pdf-over-gui/src/main/resources/izpack/a-sit-icon.png b/pdf-over-gui/src/main/resources/izpack-linux/a-sit-icon.png
index 69754c1e..69754c1e 100644
--- a/pdf-over-gui/src/main/resources/izpack/a-sit-icon.png
+++ b/pdf-over-gui/src/main/resources/izpack-linux/a-sit-icon.png
diff --git a/pdf-over-gui/src/main/resources/izpack/customicons.xml b/pdf-over-gui/src/main/resources/izpack-linux/customicons.xml
index 6222001d..6222001d 100644
--- a/pdf-over-gui/src/main/resources/izpack/customicons.xml
+++ b/pdf-over-gui/src/main/resources/izpack-linux/customicons.xml
diff --git a/pdf-over-gui/src/main/resources/izpack/icon16x16.png b/pdf-over-gui/src/main/resources/izpack-linux/icon16x16.png
index 571c7885..571c7885 100644
--- a/pdf-over-gui/src/main/resources/izpack/icon16x16.png
+++ b/pdf-over-gui/src/main/resources/izpack-linux/icon16x16.png
diff --git a/pdf-over-gui/src/main/resources/izpack/install.xml b/pdf-over-gui/src/main/resources/izpack-linux/install.xml
index 6b3fe129..ea22069d 100644
--- a/pdf-over-gui/src/main/resources/izpack/install.xml
+++ b/pdf-over-gui/src/main/resources/izpack-linux/install.xml
@@ -1,85 +1,67 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<installation version="1.0">

-

-	<info>

-		<appname>PDF-Over</appname>

-		<appversion>${project.version}</appversion>

- 		<javaversion>1.8</javaversion>

-		<authors>

-			<author name="A-SIT (Secure Information Technology Center - Austria)" email="" />

-		</authors>

-		<url>http://www.a-sit.at/</url>

-		<uninstaller condition="!izpack.macinstall" />

-		<!--run-privileged condition="izpack.windowsinstall.vista|izpack.windowsinstall.7" /-->

-	</info>

-

-	<guiprefs resizable="yes" width="500" height="360">

-		<modifier key="useFlags" value="yes" />

-		<modifier key="langDisplayType" value="native" />

-	</guiprefs>

-

-	<locale>

-		<langpack iso3="eng" />

-		<langpack iso3="deu" />

-	</locale>

-

-	<resources>

-		<res id="Unix_shortcutSpec.xml" src="./unix_shortcutSpec.xml" />

-		<res id="shortcutSpec.xml" src="./win_shortcutSpec.xml" />

-		<res id="shortcutSpec.xml_deu" src="./win_shortcutSpec_deu.xml" />

-		<res id="TargetPanel.dir.windows" src="defaultInstallDirWinProfile.txt" />

-		<res id="JFrameIcon.png" src="icon16x16.png" />

-		<res id="customicons.xml" src="./customicons.xml" />

-		<res id="Installer.image" src="a-sit-icon.png" />

-		<res id="Installer.image.0" src="a-sit-icon.png" />

-	</resources>

-

-	<native type="izpack" name="ShellLink.dll" />

-	<native type="izpack" name="ShellLink_x64.dll" />

-

-	<variables>

-		<variable name="DesktopShortcutCheckboxEnabled" value="true" />

-	</variables>

-

-	<panels>

-		<panel classname="HelloPanel" />

-		<panel classname="TargetPanel" />

-		<panel classname="InstallPanel" />

-		<panel classname="ShortcutPanel" />

-		<panel classname="SimpleFinishPanel" />

-        <panel classname="ProcessPanel"/>

-	</panels>

-

-	<packs>

-		<pack name="main" required="yes">

-			<description>Main Installation</description>

-			<updatecheck>

-				<include name="lib/**" />

-			</updatecheck>

-			<file src="lib" targetdir="$INSTALL_PATH" />

-			<file src="scripts/pdf-over_linux.sh" targetdir="$INSTALL_PATH" os="unix" />

-			<file src="scripts/uninstall_linux.sh" targetdir="$INSTALL_PATH" os="unix" />

-			<file src="scripts/pdf-over_mac.sh" targetdir="$INSTALL_PATH" os="mac" />

-			<file src="scripts/postinstall_mac.sh" targetdir="$INSTALL_PATH" os="mac" />

-			<file src="icons" targetdir="$INSTALL_PATH" />

-			<file src="ReadMe.txt" targetdir="$INSTALL_PATH" />

-			<file src="jre/${bundled-jre.archiveName}" targetdir="$INSTALL_PATH/jre" os="windows" unpack="true" />

-			<file src="jre/${bundled-jre.archiveName}" targetdir="$INSTALL_PATH/jre" os="mac" unpack="true" />

-			<file src="PDF-Over.exe" targetdir="$INSTALL_PATH" os="windows"/>

-			<file src="PDF-Over-cli.exe" targetdir="$INSTALL_PATH" os="windows"/>

-			<file src="Uninstaller.exe" targetdir="$INSTALL_PATH/Uninstaller" os="windows"/>

-            <executable targetfile="$INSTALL_PATH/pdf-over_linux.sh"

-				os="unix" stage="never"></executable>

-			<executable targetfile="$INSTALL_PATH/uninstall_linux.sh"

-				os="unix" stage="never"></executable>

-			<executable targetfile="$INSTALL_PATH/pdf-over_mac.sh"

-				os="mac" stage="never"></executable>

-			<executable targetfile="$INSTALL_PATH/postinstall_mac.sh"

-				os="mac" stage="postinstall"></executable>

-		</pack>

-	</packs>

-    

-

-

-</installation>

+<?xml version="1.0" encoding="UTF-8"?>
+
+<installation version="1.0">
+
+	<info>
+		<appname>PDF-Over</appname>
+		<appversion>${project.version}</appversion>
+ 		<javaversion>1.8</javaversion>
+		<authors>
+			<author name="A-SIT (Secure Information Technology Center - Austria)" email="" />
+		</authors>
+		<url>http://www.a-sit.at/</url>
+	</info>
+
+	<guiprefs resizable="yes" width="500" height="360">
+		<modifier key="useFlags" value="yes" />
+		<modifier key="langDisplayType" value="native" />
+	</guiprefs>
+
+	<locale>
+		<langpack iso3="eng" />
+		<langpack iso3="deu" />
+	</locale>
+
+	<resources>
+		<res id="shortcutSpec.xml" src="./unix_shortcutSpec.xml" />
+		<res id="JFrameIcon.png" src="icon16x16.png" />
+		<res id="customicons.xml" src="./customicons.xml" />
+		<res id="Installer.image" src="a-sit-icon.png" />
+		<res id="Installer.image.0" src="a-sit-icon.png" />
+	</resources>
+
+	<native type="izpack" name="ShellLink.dll" />
+	<native type="izpack" name="ShellLink_x64.dll" />
+
+	<variables>
+		<variable name="DesktopShortcutCheckboxEnabled" value="true" />
+	</variables>
+
+	<panels>
+		<panel classname="HelloPanel" />
+		<panel classname="TargetPanel" />
+		<panel classname="InstallPanel" />
+		<panel classname="ShortcutPanel" />
+		<panel classname="SimpleFinishPanel" />
+        <panel classname="ProcessPanel"/>
+	</panels>
+
+	<packs>
+		<pack name="main" required="yes">
+			<description>Main Installation</description>
+			<updatecheck>
+				<include name="lib/**" />
+			</updatecheck>
+			<file src="lib" targetdir="$INSTALL_PATH" />
+			<file src="pdf-over_linux.sh" targetdir="$INSTALL_PATH" />
+			<file src="uninstall_linux.sh" targetdir="$INSTALL_PATH" />
+			<file src="icons" targetdir="$INSTALL_PATH" />
+			<file src="ReadMe.txt" targetdir="$INSTALL_PATH" />
+            <executable targetfile="$INSTALL_PATH/pdf-over_linux.sh" stage="never" />
+			<executable targetfile="$INSTALL_PATH/uninstall_linux.sh" stage="never" />
+		</pack>
+	</packs>
+    
+
+
+</installation>
diff --git a/pdf-over-gui/src/main/resources/izpack/logo.gif b/pdf-over-gui/src/main/resources/izpack-linux/logo.gif
index 338a18ec..338a18ec 100644
--- a/pdf-over-gui/src/main/resources/izpack/logo.gif
+++ b/pdf-over-gui/src/main/resources/izpack-linux/logo.gif
diff --git a/pdf-over-gui/src/main/resources/izpack/unix_shortcutSpec.xml b/pdf-over-gui/src/main/resources/izpack-linux/unix_shortcutSpec.xml
index bd2d0ba0..60e2666d 100644
--- a/pdf-over-gui/src/main/resources/izpack/unix_shortcutSpec.xml
+++ b/pdf-over-gui/src/main/resources/izpack-linux/unix_shortcutSpec.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>

-

-<shortcuts>

-	<!-- <skipIfNotSupported/>  -->

-  <programGroup defaultName="PDF-Over"

-  location="applications"/>

-

-  <shortcut

-     name="PDF-Over"

-     programGroup="yes"

-     desktop="yes"

-     applications="no"

-     startMenu="no"

-     startup="no"

-     target="$INSTALL_PATH/scripts/pdf-over_linux.sh"

-     commandLine=""

-     workingDirectory="$INSTALL_PATH"

-     description="PDF-Over ${project.version}"

-     iconFile="$INSTALL_PATH/icons/icon.png"

-     iconIndex="0"

-     type="Application"

-     encoding="UTF-8"

-     terminal="false"

-     KdeSubstUID="false"

-     initialState="normal">

-     <createForPack name="main"/>

-   </shortcut>

-

-</shortcuts>

+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+
+<shortcuts>
+	<!-- <skipIfNotSupported/>  -->
+  <programGroup defaultName="PDF-Over"
+  location="applications"/>
+
+  <shortcut
+     name="PDF-Over"
+     programGroup="yes"
+     desktop="yes"
+     applications="no"
+     startMenu="no"
+     startup="no"
+     target="$INSTALL_PATH/scripts/pdf-over_linux.sh"
+     commandLine=""
+     workingDirectory="$INSTALL_PATH"
+     description="PDF-Over ${project.version}"
+     iconFile="$INSTALL_PATH/icons/icon.png"
+     iconIndex="0"
+     type="Application"
+     encoding="UTF-8"
+     terminal="false"
+     KdeSubstUID="false"
+     initialState="normal">
+     <createForPack name="main"/>
+   </shortcut>
+
+</shortcuts>
diff --git a/pdf-over-gui/src/main/resources/izpack/defaultInstallDirWin.txt b/pdf-over-gui/src/main/resources/izpack/defaultInstallDirWin.txt
deleted file mode 100644
index ca0f57cc..00000000
--- a/pdf-over-gui/src/main/resources/izpack/defaultInstallDirWin.txt
+++ /dev/null
@@ -1 +0,0 @@
-${ENV[ProgramFiles]}\PDF-Over
\ No newline at end of file
diff --git a/pdf-over-gui/src/main/resources/izpack/defaultInstallDirWinProfile.txt b/pdf-over-gui/src/main/resources/izpack/defaultInstallDirWinProfile.txt
deleted file mode 100644
index 9fc07023..00000000
--- a/pdf-over-gui/src/main/resources/izpack/defaultInstallDirWinProfile.txt
+++ /dev/null
@@ -1 +0,0 @@
-${ENV[APPDATA]}\PDF-Over
\ No newline at end of file
diff --git a/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec.xml b/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec.xml
deleted file mode 100644
index b6d2e734..00000000
--- a/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>

-

-<shortcuts>

-  <!-- <skipIfNotSupported/>  -->

-  <programGroup defaultName="PDF-Over" location="applications"/>

-

-  <shortcut

-     name="PDF-Over"

-     programGroup="yes"

-     desktop="yes"

-     applications="no"

-     startMenu="no"

-     startup="no"

-     target="$INSTALL_PATH/scripts/pdf-over_win.bat"

-     commandLine=""

-     workingDirectory="$INSTALL_PATH"

-     description="PDF-Over ${project.version}"

-     iconFile="$INSTALL_PATH/icons/icon.ico"

-     iconIndex="0"

-     type="Application"

-     encoding="UTF-8"

-     initialState="normal">

-     <createForPack name="main"/>

-   </shortcut>

-

-   <shortcut

-     name="Uninstall PDF-Over"

-     programGroup="yes"

-     desktop="no"

-     applications="no"

-     startMenu="no"

-     startup="no"

-     target="$INSTALL_PATH/Uninstaller/Uninstaller.exe"

-     commandLine=""

-     workingDirectory="$INSTALL_PATH/Uninstaller"

-     description="PDF-Over ${project.version} Uninstaller"

-     type="Application"

-     encoding="UTF-8"

-     initialState="minimized">

-     <createForPack name="main"/>

-   </shortcut>

-</shortcuts>

diff --git a/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec_deu.xml b/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec_deu.xml
deleted file mode 100644
index 8217560b..00000000
--- a/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec_deu.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>

-

-<shortcuts>

-  <!-- <skipIfNotSupported/>  -->

-  <programGroup defaultName="PDF-Over" location="applications"/>

-

-  <shortcut

-     name="PDF-Over"

-     programGroup="yes"

-     desktop="yes"

-     applications="no"

-     startMenu="no"

-     startup="no"

-     target="$INSTALL_PATH/scripts/pdf-over_win.bat"

-     commandLine=""

-     workingDirectory="$INSTALL_PATH"

-     description="PDF-Over ${project.version}"

-     iconFile="$INSTALL_PATH/icons/icon.ico"

-     iconIndex="0"

-     type="Application"

-     encoding="UTF-8"

-     initialState="normal">

-     <createForPack name="main"/>

-   </shortcut>

-

-   <shortcut

-     name="PDF-Over deinstallieren"

-     programGroup="yes"

-     desktop="no"

-     applications="no"

-     startMenu="no"

-     startup="no"

-     target="$INSTALL_PATH/Uninstaller/Uninstaller.exe"

-     commandLine=""

-     workingDirectory="$INSTALL_PATH/Uninstaller"

-     description="PDF-Over ${project.version} Uninstaller"

-     type="Application"

-     encoding="UTF-8"

-     initialState="minimized">

-     <createForPack name="main"/>

-   </shortcut>

-</shortcuts>

diff --git a/pdf-over-gui/src/main/resources/scripts/pdf-over_mac.sh b/pdf-over-gui/src/main/resources/scripts/pdf-over_mac.sh
index 2e0e34a7..cd4701a6 100644
--- a/pdf-over-gui/src/main/resources/scripts/pdf-over_mac.sh
+++ b/pdf-over-gui/src/main/resources/scripts/pdf-over_mac.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 BASEDIR=$(cd "$(dirname "$0")"; pwd)
 export LC_CTYPE="UTF-8"
-exec $BASEDIR/jre/${bundled-jre.nameInArchive}/bin/java -XstartOnFirstThread -cp "$BASEDIR/lib/*" at.asit.pdfover.gui.Main "$@" &
+exec $BASEDIR/jre/bin/java -XstartOnFirstThread -cp "$BASEDIR/lib/*" at.asit.pdfover.gui.Main "$@" &
diff --git a/pdf-over-gui/src/main/resources/scripts/postinstall_mac.sh b/pdf-over-gui/src/main/resources/scripts/postinstall_mac.sh
deleted file mode 100644
index 0b020ea3..00000000
--- a/pdf-over-gui/src/main/resources/scripts/postinstall_mac.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-SCRIPTDIR=$(cd "$(dirname "$0")"; pwd)
-BASEDIR=$(cd "$(dirname "$0")/.."; pwd)
-export LC_CTYPE="UTF-8"
-cd "$SCRIPTDIR"
-chmod a+x pdf-over_mac.sh
-cd "$BASEDIR"
-if [ -d "$BASEDIR.app" ]; then
-	osacompile -e "do shell script \"$SCRIPTDIR/pdf-over_mac.sh\"" -x -o PDF-Over.app
-	cp -f icons/icon.icns PDF-Over.app/Contents/Resources/applet.icns
-else
-	osacompile -e "do shell script \"$BASEDIR.app/Contents/scripts/pdf-over_mac.sh\"" -x -o "$BASEDIR.app"
-	cp -f icons/icon.icns "$BASEDIR.app"/Contents/Resources/applet.icns
-	mv "$BASEDIR"/* "$BASEDIR.app"/Contents/
-	rmdir "$BASEDIR"
-	ln -s "$BASEDIR.app" "$BASEDIR"
-fi