From 823751ad89497eddc5ed2e76d3be63dcc0c357b8 Mon Sep 17 00:00:00 2001
From: Andreas Abraham <aabraham@iaik.tugraz.at>
Date: Wed, 21 Mar 2018 16:35:44 +0100
Subject: postinstall scripts changed, error message

---
 pdf-over-gui/pom.xml                               | 20 ++++++++--------
 .../src/main/java/at/asit/pdfover/gui/Main.java    | 14 ++++++++++-
 pdf-over-gui/src/main/resources/izpack/install.xml |  4 ++--
 .../main/resources/scripts/postInstall_linux.sh    |  2 +-
 .../src/main/resources/scripts/postInstall_win.bat |  2 +-
 pdf-over-install-helper/pom.xml                    | 27 +++++++++++-----------
 pdf-over-signer/pdf-over-sigpdfas3/pom.xml         |  2 +-
 7 files changed, 42 insertions(+), 29 deletions(-)

diff --git a/pdf-over-gui/pom.xml b/pdf-over-gui/pom.xml
index 5493566f..788d3afc 100644
--- a/pdf-over-gui/pom.xml
+++ b/pdf-over-gui/pom.xml
@@ -168,15 +168,15 @@
 									<outputDirectory>${staging.dir}/lib-swt</outputDirectory>
 									<destFileName>swt-${target.name}-64.jar</destFileName>
 								</artifactItem>
-<!-- 								<artifactItem> -->
-<!-- 									<groupId>at.a-sit</groupId> -->
-<!-- 									<artifactId>pdf-over-install-helper</artifactId> -->
-<!-- 									<version>1.0.0</version> -->
-<!-- 									<type>jar</type> -->
-<!-- 									<overWrite>true</overWrite> -->
-<!-- 									<outputDirectory>${staging.dir}/lib</outputDirectory> -->
-<!-- 									<destFileName>pdf-over-install-helper-1.0.0.jar</destFileName> -->
-<!-- 								</artifactItem> -->
+								<artifactItem>
+									<groupId>at.a-sit</groupId>
+									<artifactId>pdf-over-install-helper</artifactId>
+									<version>1.0.0</version>
+									<type>jar</type>
+									<overWrite>true</overWrite>
+									<outputDirectory>${staging.dir}/lib</outputDirectory>
+									<destFileName>pdf-over-install-helper-1.0.0.jar</destFileName>
+								</artifactItem>
 							</artifactItems>
 						</configuration>
 					</execution>
@@ -619,7 +619,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-jarsigner-plugin</artifactId>
-						<version>1.2</version>
+						<version>1.4</version>
 						<configuration>
 							<keystore>${ks-file}</keystore>
 							<alias>a-sit-3</alias>
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/Main.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/Main.java
index 31128423..9cf917bd 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/Main.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/Main.java
@@ -20,10 +20,13 @@ import java.io.File;
 import java.io.IOException;
 import java.net.URL;
 
+import javax.swing.JOptionPane;
+
 import org.apache.log4j.PropertyConfigurator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import at.asit.pdfover.gui.utils.Messages;
 import at.asit.pdfover.gui.workflow.StateMachineImpl;
 
 /**
@@ -54,6 +57,7 @@ public class Main {
 //		}
 //		log.info("===== Starting " + Constants.APP_NAME_VERSION + " ====="); //$NON-NLS-1$ //$NON-NLS-2$
 
+		try {
 		File configDir = new File(Constants.CONFIG_DIRECTORY);
 	
 		if (!configDir.exists()) {
@@ -76,7 +80,15 @@ public class Main {
 		
 		
 		log.debug("Ended stateMachine ..."); //$NON-NLS-1$
-
+		}
+		catch (Throwable e) {
+			
+			log.error("Error wrong Java Architecture, please re-install pdf-over "); //$NON-NLS-1$
+			log.error(e.getMessage());
+			JOptionPane.showMessageDialog(null,
+					"Invalid Java Architecture! Please re-install the latest version of PDF-Over", //$NON-NLS-1$
+					null, JOptionPane.ERROR_MESSAGE);
+		}
 
 		// Workaround for remaining AWT-Shutdown thread on OSX
 		System.exit(0);
diff --git a/pdf-over-gui/src/main/resources/izpack/install.xml b/pdf-over-gui/src/main/resources/izpack/install.xml
index cea5d66b..40fcb820 100644
--- a/pdf-over-gui/src/main/resources/izpack/install.xml
+++ b/pdf-over-gui/src/main/resources/izpack/install.xml
@@ -34,7 +34,7 @@
 		<res id="customicons.xml" src="./customicons.xml" />
 		<res id="Installer.image" src="logo.gif" />
 		<res id="Installer.image.0" src="logo.gif" />
-		<res id="pdf-over-install-helper-1.0.0.jar" src="pdf-over-install-helper-1.0.0.jar" />
+<!-- 		<res id="pdf-over-install-helper-1.0.0.jar" src="pdf-over-install-helper-1.0.0.jar" /> -->
 	</resources>
 
 	<native type="izpack" name="ShellLink.dll" />
@@ -68,7 +68,7 @@
 			<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"/>
-            <file src="pdf-over-install-helper-1.0.0.jar" targetdir="$INSTALL_PATH/libs" />
+<!--             <file src="pdf-over-install-helper-1.0.0.jar" targetdir="$INSTALL_PATH/libs" /> -->
             <executable targetfile="$INSTALL_PATH/scripts/pdf-over_linux.sh"
 				os="unix" stage="never"></executable>
 			<executable targetfile="$INSTALL_PATH/scripts/uninstall_linux.sh"
diff --git a/pdf-over-gui/src/main/resources/scripts/postInstall_linux.sh b/pdf-over-gui/src/main/resources/scripts/postInstall_linux.sh
index 0e6cd902..e7553a99 100644
--- a/pdf-over-gui/src/main/resources/scripts/postInstall_linux.sh
+++ b/pdf-over-gui/src/main/resources/scripts/postInstall_linux.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec java -jar postInstall.jar
+exec java -jar ../lib/pdf-over-install-helper-1.0.0.jar
diff --git a/pdf-over-gui/src/main/resources/scripts/postInstall_win.bat b/pdf-over-gui/src/main/resources/scripts/postInstall_win.bat
index 44e64c3a..419ae097 100644
--- a/pdf-over-gui/src/main/resources/scripts/postInstall_win.bat
+++ b/pdf-over-gui/src/main/resources/scripts/postInstall_win.bat
@@ -1 +1 @@
-start /b javaw -jar postInstall.jar
+start /b java -jar ../lib/pdf-over-install-helper-1.0.0.jar
diff --git a/pdf-over-install-helper/pom.xml b/pdf-over-install-helper/pom.xml
index 9ca9eedb..5114e61e 100644
--- a/pdf-over-install-helper/pom.xml
+++ b/pdf-over-install-helper/pom.xml
@@ -6,7 +6,6 @@
 		<artifactId>pdf-over</artifactId>
 		<version>4.1.17-SNAPSHOT</version>
 	</parent>
-	
 	<artifactId>pdf-over-install-helper</artifactId>
 	<version>1.0.0</version>
 
@@ -35,26 +34,28 @@
 						<debuglevel>lines,vars,source</debuglevel>
 					</configuration>
 				</plugin>
-<!-- 				<plugin> -->
-<!-- 					<artifactId>maven-release-plugin</artifactId> -->
-<!-- 					<version>2.4.2</version> -->
-<!-- 					<dependencies> -->
-<!-- 						<dependency> -->
-<!-- 							<groupId>org.apache.maven.scm</groupId> -->
-<!-- 							<artifactId>maven-scm-provider-gitexe</artifactId> -->
-<!-- 							<version>1.8.1</version> -->
-<!-- 						</dependency> -->
-<!-- 					</dependencies> -->
-<!-- 				</plugin> -->
 				<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-dependency-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>copy-dependencies</id>
+								<phase>prepare-package</phase>
+								<goals>
+									<goal>copy-dependencies</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-jar-plugin</artifactId>
 					<configuration>
 						<archive>
 							<manifest>
+								<addClasspath>true</addClasspath>
 								<mainClass>at.asit.helper.Main</mainClass>
 							</manifest>
-							<addMavenDescriptor>false</addMavenDescriptor>
 						</archive>
 					</configuration>
 				</plugin>
diff --git a/pdf-over-signer/pdf-over-sigpdfas3/pom.xml b/pdf-over-signer/pdf-over-sigpdfas3/pom.xml
index 8cc11a48..663a2cfd 100644
--- a/pdf-over-signer/pdf-over-sigpdfas3/pom.xml
+++ b/pdf-over-signer/pdf-over-sigpdfas3/pom.xml
@@ -4,7 +4,7 @@
 		<artifactId>pdf-over-signer</artifactId>
 		<groupId>at.a-sit</groupId>
 		<version>4.1.5-SNAPSHOT</version>
-		<relativePath>..</relativePath>
+<!-- 		<relativePath>..</relativePath> -->
 	</parent>
 	<artifactId>pdf-over-sigpdfas3</artifactId>
 	<name>PDF-Over PDF-AS Signer</name>
-- 
cgit v1.2.3