From 767add8ab5d15bc9ac55a441a5bffc0682293e22 Mon Sep 17 00:00:00 2001
From: Andreas Abraham <aabraham@iaik.tugraz.at>
Date: Mon, 11 Jun 2018 13:14:37 +0200
Subject: release rollback

---
 installer/windows/PDF-Over-signed.aip              | 112 ++++++++++-----------
 pdf-over-gui/pom.xml                               |   4 +-
 .../src/main/java/at/asit/helper/Main.java         |   2 +-
 3 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/installer/windows/PDF-Over-signed.aip b/installer/windows/PDF-Over-signed.aip
index fb6d7ab7..52435542 100644
--- a/installer/windows/PDF-Over-signed.aip
+++ b/installer/windows/PDF-Over-signed.aip
@@ -13,6 +13,7 @@
     <ROW Property="ALLUSERS" Value="1" MultiBuildValue="DefaultBuild:2"/>
     <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install [|ProductName]." ValueLocId="*"/>
     <ROW Property="ARPPRODUCTICON" Value="icon.exe" Type="8"/>
+    <ROW Property="CTRLS" Value="2"/>
     <ROW Property="Manufacturer" Value="A-SIT (Secure Information Technology Center - Austria)"/>
     <ROW Property="ProductCode" Value="1033:{A5F7CB3A-F3A0-469F-9DE3-A73447F62895} 1031:{E7C1728F-9EFF-4495-A34D-D569D1C75D2E} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
@@ -40,7 +41,7 @@
     <ROW Component="ProductInformation" ComponentId="{8126D538-2928-475F-8DBB-9BFB1EB29D9F}" Directory_="APPDIR" Attributes="4" KeyPath="Version"/>
     <ROW Component="ReadMe.txt" ComponentId="{83873372-D521-4481-A6CE-17BFE2457701}" Directory_="APPDIR" Attributes="0" KeyPath="ReadMe.txt_1" Type="0"/>
     <ROW Component="SHORTCUTDIR" ComponentId="{E162254F-9CB5-4FE2-8CC5-7EE2580EB565}" Directory_="SHORTCUTDIR" Attributes="0"/>
-    <ROW Component="activation1.1.1.jar" ComponentId="{070C4E4E-DF5A-4E8D-ADDA-E64FAAC0DEDF}" Directory_="lib_1_Dir" Attributes="0" KeyPath="activation1.1.1.jar_1" Type="0"/>
+    <ROW Component="commonslang33.3.2.jar" ComponentId="{ECB30616-30D5-42C1-94BF-A76C1F76331E}" Directory_="lib_1_Dir" Attributes="0" KeyPath="commonslang33.3.2.jar" Type="0"/>
     <ROW Component="icon.icns_1" ComponentId="{1E21D20F-B60F-41F0-A463-485E4E236660}" Directory_="icons_1_Dir" Attributes="0" KeyPath="icon.icns_1" Type="0"/>
     <ROW Component="lib" ComponentId="{AC2FDF64-8069-494B-8B1F-B9AA178C8ED9}" Directory_="lib_1_Dir" Attributes="0"/>
     <ROW Component="libswt" ComponentId="{BE13A95A-A8A2-48E1-8859-F71AE0D7B5C2}" Directory_="libswt_1_Dir" Attributes="0"/>
@@ -50,30 +51,30 @@
     <ROW Component="swtwindows32.jar_1" ComponentId="{7B02505A-8B04-457B-AAFA-112F55EED458}" Directory_="libswt_1_Dir" Attributes="0" KeyPath="swtwindows32.jar_1" Type="0"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
-    <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AIShRegAnswer ProductInformation ReadMe.txt SHORTCUTDIR activation1.1.1.jar icon.icns_1 lib libswt pdfover_linux.sh_1 pdfover_win.bat scripts swtwindows32.jar_1"/>
+    <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AIShRegAnswer ProductInformation ReadMe.txt SHORTCUTDIR commonslang33.3.2.jar icon.icns_1 lib libswt pdfover_linux.sh_1 pdfover_win.bat scripts swtwindows32.jar_1"/>
     <ATTRIBUTE name="CurrentFeature" value="MainFeature"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent">
-    <ROW File="FastInfoset1.2.13.jar_1" Component_="activation1.1.1.jar" FileName="FastIn~1.jar|FastInfoset-1.2.13.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\FastInfoset-1.2.13.jar" SelfReg="false" NextFile="fontbox1.8.11.jar_1"/>
+    <ROW File="FastInfoset1.2.13.jar" Component_="commonslang33.3.2.jar" FileName="FastIn~1.jar|FastInfoset-1.2.13.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\FastInfoset-1.2.13.jar" SelfReg="false" NextFile="fontbox1.8.11.jar"/>
     <ROW File="ReadMe.txt_1" Component_="ReadMe.txt" FileName="ReadMe.txt" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\ReadMe.txt" SelfReg="false" NextFile="pdfover_wincli.bat_1"/>
-    <ROW File="activation1.1.1.jar_1" Component_="activation1.1.1.jar" FileName="activa~1.jar|activation-1.1.1.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\activation-1.1.1.jar" SelfReg="false" NextFile="bcprovjdk15on1.59.jar_1"/>
-    <ROW File="bcprovjdk15on1.59.jar_1" Component_="activation1.1.1.jar" FileName="bcprov~1.jar|bcprov-jdk15on-1.59.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\bcprov-jdk15on-1.59.jar" SelfReg="false" NextFile="commonscodec1.6.jar_1"/>
-    <ROW File="commonscodec1.6.jar_1" Component_="activation1.1.1.jar" FileName="common~1.jar|commons-codec-1.6.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\commons-codec-1.6.jar" SelfReg="false" NextFile="commonscollections3.2.2.jar_1"/>
-    <ROW File="commonscollections3.2.2.jar_1" Component_="activation1.1.1.jar" FileName="common~2.jar|commons-collections-3.2.2.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\commons-collections-3.2.2.jar" SelfReg="false" NextFile="commonscollections44.1.jar_1"/>
-    <ROW File="commonscollections44.1.jar_1" Component_="activation1.1.1.jar" FileName="common~3.jar|commons-collections4-4.1.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\commons-collections4-4.1.jar" SelfReg="false" NextFile="commonshttpclient3.1.jar_1"/>
-    <ROW File="commonshttpclient3.1.jar_1" Component_="activation1.1.1.jar" FileName="common~4.jar|commons-httpclient-3.1.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\commons-httpclient-3.1.jar" SelfReg="false" NextFile="commonsio2.4.jar_1"/>
-    <ROW File="commonsio2.4.jar_1" Component_="activation1.1.1.jar" FileName="common~5.jar|commons-io-2.4.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\commons-io-2.4.jar" SelfReg="false" NextFile="commonslang33.3.2.jar_1"/>
-    <ROW File="commonslang33.3.2.jar_1" Component_="activation1.1.1.jar" FileName="common~6.jar|commons-lang3-3.3.2.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\commons-lang3-3.3.2.jar" SelfReg="false" NextFile="commonslogging1.0.4.jar_1"/>
-    <ROW File="commonslogging1.0.4.jar_1" Component_="activation1.1.1.jar" FileName="common~7.jar|commons-logging-1.0.4.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\commons-logging-1.0.4.jar" SelfReg="false" NextFile="core3.2.0.jar_1"/>
-    <ROW File="core3.2.0.jar_1" Component_="activation1.1.1.jar" FileName="core-3~1.jar|core-3.2.0.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\core-3.2.0.jar" SelfReg="false" NextFile="FastInfoset1.2.13.jar_1"/>
-    <ROW File="fontbox1.8.11.jar_1" Component_="activation1.1.1.jar" FileName="fontbo~1.jar|fontbox-1.8.11.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\fontbox-1.8.11.jar" SelfReg="false" NextFile="httpclient4.5.3.jar_1"/>
-    <ROW File="httpclient4.5.3.jar_1" Component_="activation1.1.1.jar" FileName="httpcl~1.jar|httpclient-4.5.3.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\httpclient-4.5.3.jar" SelfReg="false" NextFile="httpcore4.4.6.jar_1"/>
-    <ROW File="httpcore4.4.6.jar_1" Component_="activation1.1.1.jar" FileName="httpco~1.jar|httpcore-4.4.6.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\httpcore-4.4.6.jar" SelfReg="false" NextFile="httpmime4.3.5.jar_1"/>
-    <ROW File="httpmime4.3.5.jar_1" Component_="activation1.1.1.jar" FileName="httpmi~1.jar|httpmime-4.3.5.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\httpmime-4.3.5.jar" SelfReg="false" NextFile="iaik_cms2.15.jar_1"/>
-    <ROW File="iaik_cms2.15.jar_1" Component_="activation1.1.1.jar" FileName="iaik_c~1.jar|iaik_cms-2.15.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\iaik_cms-2.15.jar" SelfReg="false" NextFile="iaik_eccelerate3.01.jar_1"/>
-    <ROW File="iaik_eccelerate3.01.jar_1" Component_="activation1.1.1.jar" FileName="iaik_e~1.jar|iaik_eccelerate-3.01.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\iaik_eccelerate-3.01.jar" SelfReg="false" NextFile="iaik_eccelerate_cms3.01.jar_1"/>
-    <ROW File="iaik_eccelerate_cms3.01.jar_1" Component_="activation1.1.1.jar" FileName="iaik_e~2.jar|iaik_eccelerate_cms-3.01.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\iaik_eccelerate_cms-3.01.jar" SelfReg="false" NextFile="iaik_jce_full_signed5.5.jar_1"/>
-    <ROW File="iaik_jce_full_signed5.5.jar_1" Component_="activation1.1.1.jar" FileName="iaik_j~1.jar|iaik_jce_full_signed-5.5.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\iaik_jce_full_signed-5.5.jar" SelfReg="false" NextFile="istackcommonsruntime3.0.5.jar_1"/>
+    <ROW File="activation1.1.1.jar" Component_="commonslang33.3.2.jar" FileName="activa~1.jar|activation-1.1.1.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\activation-1.1.1.jar" SelfReg="false" NextFile="bcprovjdk15on1.59.jar"/>
+    <ROW File="bcprovjdk15on1.59.jar" Component_="commonslang33.3.2.jar" FileName="bcprov~1.jar|bcprov-jdk15on-1.59.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\bcprov-jdk15on-1.59.jar" SelfReg="false" NextFile="commonscodec1.6.jar"/>
+    <ROW File="commonscodec1.6.jar" Component_="commonslang33.3.2.jar" FileName="common~3.jar|commons-codec-1.6.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\commons-codec-1.6.jar" SelfReg="false" NextFile="commonscollections3.2.2.jar"/>
+    <ROW File="commonscollections3.2.2.jar" Component_="commonslang33.3.2.jar" FileName="common~4.jar|commons-collections-3.2.2.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\commons-collections-3.2.2.jar" SelfReg="false" NextFile="commonscollections44.1.jar"/>
+    <ROW File="commonscollections44.1.jar" Component_="commonslang33.3.2.jar" FileName="common~5.jar|commons-collections4-4.1.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\commons-collections4-4.1.jar" SelfReg="false" NextFile="commonshttpclient3.1.jar"/>
+    <ROW File="commonshttpclient3.1.jar" Component_="commonslang33.3.2.jar" FileName="common~6.jar|commons-httpclient-3.1.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\commons-httpclient-3.1.jar" SelfReg="false" NextFile="commonsio2.4.jar"/>
+    <ROW File="commonsio2.4.jar" Component_="commonslang33.3.2.jar" FileName="common~7.jar|commons-io-2.4.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\commons-io-2.4.jar" SelfReg="false"/>
+    <ROW File="commonslang33.3.2.jar" Component_="commonslang33.3.2.jar" FileName="common~1.jar|commons-lang3-3.3.2.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\commons-lang3-3.3.2.jar" SelfReg="false" NextFile="commonslogging1.0.4.jar"/>
+    <ROW File="commonslogging1.0.4.jar" Component_="commonslang33.3.2.jar" FileName="common~2.jar|commons-logging-1.0.4.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\commons-logging-1.0.4.jar" SelfReg="false" NextFile="core3.2.0.jar"/>
+    <ROW File="core3.2.0.jar" Component_="commonslang33.3.2.jar" FileName="core-3~1.jar|core-3.2.0.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\core-3.2.0.jar" SelfReg="false" NextFile="FastInfoset1.2.13.jar"/>
+    <ROW File="fontbox1.8.11.jar" Component_="commonslang33.3.2.jar" FileName="fontbo~1.jar|fontbox-1.8.11.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\fontbox-1.8.11.jar" SelfReg="false" NextFile="httpclient4.5.3.jar"/>
+    <ROW File="httpclient4.5.3.jar" Component_="commonslang33.3.2.jar" FileName="httpcl~1.jar|httpclient-4.5.3.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\httpclient-4.5.3.jar" SelfReg="false" NextFile="httpcore4.4.6.jar"/>
+    <ROW File="httpcore4.4.6.jar" Component_="commonslang33.3.2.jar" FileName="httpco~1.jar|httpcore-4.4.6.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\httpcore-4.4.6.jar" SelfReg="false" NextFile="httpmime4.3.5.jar"/>
+    <ROW File="httpmime4.3.5.jar" Component_="commonslang33.3.2.jar" FileName="httpmi~1.jar|httpmime-4.3.5.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\httpmime-4.3.5.jar" SelfReg="false" NextFile="iaik_cms2.15.jar"/>
+    <ROW File="iaik_cms2.15.jar" Component_="commonslang33.3.2.jar" FileName="iaik_c~1.jar|iaik_cms-2.15.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\iaik_cms-2.15.jar" SelfReg="false" NextFile="iaik_eccelerate_cms3.01.jar"/>
+    <ROW File="iaik_eccelerate3.01.jar" Component_="commonslang33.3.2.jar" FileName="iaik_e~2.jar|iaik_eccelerate-3.01.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\iaik_eccelerate-3.01.jar" SelfReg="false" NextFile="iaik_jce_full_signed5.5.jar"/>
+    <ROW File="iaik_eccelerate_cms3.01.jar" Component_="commonslang33.3.2.jar" FileName="iaik_e~1.jar|iaik_eccelerate_cms-3.01.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\iaik_eccelerate_cms-3.01.jar" SelfReg="false" NextFile="iaik_eccelerate3.01.jar"/>
+    <ROW File="iaik_jce_full_signed5.5.jar" Component_="commonslang33.3.2.jar" FileName="iaik_j~1.jar|iaik_jce_full_signed-5.5.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\iaik_jce_full_signed-5.5.jar" SelfReg="false" NextFile="istackcommonsruntime3.0.5.jar"/>
     <ROW File="icon.icns_1" Component_="icon.icns_1" FileName="icon~1.icn|icon.icns" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\icons\icon.icns" SelfReg="false" NextFile="icon.ico_1"/>
     <ROW File="icon.ico_1" Component_="icon.icns_1" FileName="icon.ico" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\icons\icon.ico" SelfReg="false" NextFile="icon.png_1"/>
     <ROW File="icon.png_1" Component_="icon.icns_1" FileName="icon.png" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\icons\icon.png" SelfReg="false" NextFile="icon144x144.png_1"/>
@@ -82,42 +83,42 @@
     <ROW File="icon24x24.png_1" Component_="icon.icns_1" FileName="icon24~1.png|icon24x24.png" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\icons\icon24x24.png" SelfReg="false" NextFile="icon32x32.png_1"/>
     <ROW File="icon32x32.png_1" Component_="icon.icns_1" FileName="icon32~1.png|icon32x32.png" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\icons\icon32x32.png" SelfReg="false" NextFile="icon48x48.png_1"/>
     <ROW File="icon48x48.png_1" Component_="icon.icns_1" FileName="icon48~1.png|icon48x48.png" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\icons\icon48x48.png" SelfReg="false" NextFile="icon96x96.png_1"/>
-    <ROW File="icon96x96.png_1" Component_="icon.icns_1" FileName="icon96~1.png|icon96x96.png" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\icons\icon96x96.png" SelfReg="false" NextFile="activation1.1.1.jar_1"/>
-    <ROW File="istackcommonsruntime3.0.5.jar_1" Component_="activation1.1.1.jar" FileName="istack~1.jar|istack-commons-runtime-3.0.5.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\istack-commons-runtime-3.0.5.jar" SelfReg="false" NextFile="javase3.2.0.jar_1"/>
-    <ROW File="javase3.2.0.jar_1" Component_="activation1.1.1.jar" FileName="javase~1.jar|javase-3.2.0.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\javase-3.2.0.jar" SelfReg="false" NextFile="javassist3.11.0.GA.jar_1"/>
-    <ROW File="javassist3.11.0.GA.jar_1" Component_="activation1.1.1.jar" FileName="javass~1.jar|javassist-3.11.0.GA.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\javassist-3.11.0.GA.jar" SelfReg="false" NextFile="jaxbapi2.3.0.jar_1"/>
-    <ROW File="jaxbapi2.3.0.jar_1" Component_="activation1.1.1.jar" FileName="jaxb-a~1.jar|jaxb-api-2.3.0.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\jaxb-api-2.3.0.jar" SelfReg="false" NextFile="jaxbcore2.3.0.jar_1"/>
-    <ROW File="jaxbcore2.3.0.jar_1" Component_="activation1.1.1.jar" FileName="jaxb-c~1.jar|jaxb-core-2.3.0.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\jaxb-core-2.3.0.jar" SelfReg="false" NextFile="jaxbruntime2.3.0.jar_1"/>
-    <ROW File="jaxbruntime2.3.0.jar_1" Component_="activation1.1.1.jar" FileName="jaxb-r~1.jar|jaxb-runtime-2.3.0.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\jaxb-runtime-2.3.0.jar" SelfReg="false" NextFile="jbig21.0.jar_1"/>
-    <ROW File="jbig21.0.jar_1" Component_="activation1.1.1.jar" FileName="jbig2-~1.jar|jbig2-1.0.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\jbig2-1.0.jar" SelfReg="false" NextFile="jcloverslf4j1.7.18.jar_1"/>
-    <ROW File="jcloverslf4j1.7.18.jar_1" Component_="activation1.1.1.jar" FileName="jcl-ov~1.jar|jcl-over-slf4j-1.7.18.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\jcl-over-slf4j-1.7.18.jar" SelfReg="false" NextFile="jempbox1.8.11.jar_1"/>
-    <ROW File="jempbox1.8.11.jar_1" Component_="activation1.1.1.jar" FileName="jempbo~1.jar|jempbox-1.8.11.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\jempbox-1.8.11.jar" SelfReg="false" NextFile="log4j1.2.17.jar_1"/>
-    <ROW File="log4j1.2.17.jar_1" Component_="activation1.1.1.jar" FileName="log4j-~1.jar|log4j-1.2.17.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\log4j-1.2.17.jar" SelfReg="false" NextFile="metadataextractor2.9.1.jar_1"/>
-    <ROW File="metadataextractor2.9.1.jar_1" Component_="activation1.1.1.jar" FileName="metada~1.jar|metadata-extractor-2.9.1.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\metadata-extractor-2.9.1.jar" SelfReg="false" NextFile="ognl3.0.8.jar_1"/>
-    <ROW File="ognl3.0.8.jar_1" Component_="activation1.1.1.jar" FileName="ognl-3~1.jar|ognl-3.0.8.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\ognl-3.0.8.jar" SelfReg="false" NextFile="pdfascommon4.1.2.jar_1"/>
-    <ROW File="pdfascommon4.1.2.jar_1" Component_="activation1.1.1.jar" FileName="pdf-as~1.jar|pdf-as-common-4.1.2.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-as-common-4.1.2.jar" SelfReg="false" NextFile="pdfaslib4.1.2.jar_1"/>
-    <ROW File="pdfaslib4.1.2.jar_1" Component_="activation1.1.1.jar" FileName="pdf-as~2.jar|pdf-as-lib-4.1.2.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-as-lib-4.1.2.jar" SelfReg="false" NextFile="pdfaspdfbox4.1.2.jar_1"/>
-    <ROW File="pdfaspdfbox4.1.2.jar_1" Component_="activation1.1.1.jar" FileName="pdf-as~3.jar|pdf-as-pdfbox-4.1.2.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-as-pdfbox-4.1.2.jar" SelfReg="false" NextFile="pdfovergui4.1.19SNAPSHOT.jar_1"/>
-    <ROW File="pdfbox1.8.11.jar_1" Component_="activation1.1.1.jar" FileName="pdfbox~1.jar|pdfbox-1.8.11.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdfbox-1.8.11.jar" SelfReg="false" NextFile="pdfview0.9.3CyBot.jar_1"/>
-    <ROW File="pdfover_win.bat_1" Component_="pdfover_win.bat" FileName="pdf-ov~2.bat|pdf-over_win.bat" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\scripts\pdf-over_win.bat" SelfReg="false" NextFile="postInstall_win.bat"/>
+    <ROW File="icon96x96.png_1" Component_="icon.icns_1" FileName="icon96~1.png|icon96x96.png" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\icons\icon96x96.png" SelfReg="false" NextFile="swtwindows32.jar_1"/>
+    <ROW File="istackcommonsruntime3.0.5.jar" Component_="commonslang33.3.2.jar" FileName="istack~1.jar|istack-commons-runtime-3.0.5.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\istack-commons-runtime-3.0.5.jar" SelfReg="false" NextFile="javase3.2.0.jar"/>
+    <ROW File="javase3.2.0.jar" Component_="commonslang33.3.2.jar" FileName="javase~1.jar|javase-3.2.0.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\javase-3.2.0.jar" SelfReg="false" NextFile="javassist3.11.0.GA.jar"/>
+    <ROW File="javassist3.11.0.GA.jar" Component_="commonslang33.3.2.jar" FileName="javass~1.jar|javassist-3.11.0.GA.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\javassist-3.11.0.GA.jar" SelfReg="false" NextFile="jaxbapi2.3.0.jar"/>
+    <ROW File="jaxbapi2.3.0.jar" Component_="commonslang33.3.2.jar" FileName="jaxb-a~1.jar|jaxb-api-2.3.0.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\jaxb-api-2.3.0.jar" SelfReg="false" NextFile="jaxbcore2.3.0.jar"/>
+    <ROW File="jaxbcore2.3.0.jar" Component_="commonslang33.3.2.jar" FileName="jaxb-c~1.jar|jaxb-core-2.3.0.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\jaxb-core-2.3.0.jar" SelfReg="false" NextFile="jaxbruntime2.3.0.jar"/>
+    <ROW File="jaxbruntime2.3.0.jar" Component_="commonslang33.3.2.jar" FileName="jaxb-r~1.jar|jaxb-runtime-2.3.0.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\jaxb-runtime-2.3.0.jar" SelfReg="false" NextFile="jbig21.0.jar"/>
+    <ROW File="jbig21.0.jar" Component_="commonslang33.3.2.jar" FileName="jbig2-~1.jar|jbig2-1.0.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\jbig2-1.0.jar" SelfReg="false" NextFile="jcloverslf4j1.7.18.jar"/>
+    <ROW File="jcloverslf4j1.7.18.jar" Component_="commonslang33.3.2.jar" FileName="jcl-ov~1.jar|jcl-over-slf4j-1.7.18.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\jcl-over-slf4j-1.7.18.jar" SelfReg="false" NextFile="jempbox1.8.11.jar"/>
+    <ROW File="jempbox1.8.11.jar" Component_="commonslang33.3.2.jar" FileName="jempbo~1.jar|jempbox-1.8.11.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\jempbox-1.8.11.jar" SelfReg="false" NextFile="log4j1.2.17.jar"/>
+    <ROW File="log4j1.2.17.jar" Component_="commonslang33.3.2.jar" FileName="log4j-~1.jar|log4j-1.2.17.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\log4j-1.2.17.jar" SelfReg="false" NextFile="metadataextractor2.9.1.jar"/>
+    <ROW File="metadataextractor2.9.1.jar" Component_="commonslang33.3.2.jar" FileName="metada~1.jar|metadata-extractor-2.9.1.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\metadata-extractor-2.9.1.jar" SelfReg="false" NextFile="ognl3.0.8.jar"/>
+    <ROW File="ognl3.0.8.jar" Component_="commonslang33.3.2.jar" FileName="ognl-3~1.jar|ognl-3.0.8.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\ognl-3.0.8.jar" SelfReg="false" NextFile="org.eclipse.swt.win32.win32.x864.3.2.jar"/>
+    <ROW File="org.eclipse.swt.win32.win32.x864.3.2.jar" Component_="commonslang33.3.2.jar" FileName="orgecl~1.jar|org.eclipse.swt.win32.win32.x86-4.3.2.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\org.eclipse.swt.win32.win32.x86-4.3.2.jar" SelfReg="false" NextFile="pdfascommon4.1.3.jar"/>
+    <ROW File="pdfascommon4.1.3.jar" Component_="commonslang33.3.2.jar" FileName="pdf-as~1.jar|pdf-as-common-4.1.3.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-as-common-4.1.3.jar" SelfReg="false" NextFile="pdfaslib4.1.3.jar"/>
+    <ROW File="pdfaslib4.1.3.jar" Component_="commonslang33.3.2.jar" FileName="pdf-as~2.jar|pdf-as-lib-4.1.3.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-as-lib-4.1.3.jar" SelfReg="false" NextFile="pdfaspdfbox4.1.3.jar"/>
+    <ROW File="pdfaspdfbox4.1.3.jar" Component_="commonslang33.3.2.jar" FileName="pdf-as~3.jar|pdf-as-pdfbox-4.1.3.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-as-pdfbox-4.1.3.jar" SelfReg="false" NextFile="pdfbox1.8.11.jar"/>
+    <ROW File="pdfbox1.8.11.jar" Component_="commonslang33.3.2.jar" FileName="pdfbox~1.jar|pdfbox-1.8.11.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdfbox-1.8.11.jar" SelfReg="false" NextFile="pdfovergui4.1.19.jar"/>
+    <ROW File="pdfover_win.bat_1" Component_="pdfover_win.bat" FileName="pdf-ov~2.bat|pdf-over_win.bat" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\scripts\pdf-over_win.bat" SelfReg="false" NextFile="commonslang33.3.2.jar"/>
     <ROW File="pdfover_wincli.bat_1" Component_="pdfover_linux.sh_1" FileName="pdf-ov~1.bat|pdf-over_win-cli.bat" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\scripts\pdf-over_win-cli.bat" SelfReg="false" NextFile="pdfover_win.bat_1"/>
-    <ROW File="pdfovergui4.1.19SNAPSHOT.jar_1" Component_="activation1.1.1.jar" FileName="pdf-ov~1.jar|pdf-over-gui-4.1.19-SNAPSHOT.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-over-gui-4.1.19-SNAPSHOT.jar" SelfReg="false" NextFile="pdfoverinstallhelper1.0.0.jar_1"/>
-    <ROW File="pdfoverinstallhelper1.0.0.jar_1" Component_="activation1.1.1.jar" FileName="pdf-ov~2.jar|pdf-over-install-helper-1.0.0.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-over-install-helper-1.0.0.jar" SelfReg="false" NextFile="pdfoversignator4.1.19SNAPSHOT.jar_1"/>
-    <ROW File="pdfoversignator4.1.19SNAPSHOT.jar_1" Component_="activation1.1.1.jar" FileName="pdf-ov~3.jar|pdf-over-signator-4.1.19-SNAPSHOT.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-over-signator-4.1.19-SNAPSHOT.jar" SelfReg="false" NextFile="pdfoversigpdfas44.1.19SNAPSHOT.jar_1"/>
-    <ROW File="pdfoversigpdfas44.1.19SNAPSHOT.jar_1" Component_="activation1.1.1.jar" FileName="pdf-ov~4.jar|pdf-over-sigpdfas4-4.1.19-SNAPSHOT.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-over-sigpdfas4-4.1.19-SNAPSHOT.jar" SelfReg="false" NextFile="pdfbox1.8.11.jar_1"/>
-    <ROW File="pdfview0.9.3CyBot.jar_1" Component_="activation1.1.1.jar" FileName="pdfvie~1.jar|pdfview-0.9.3-CyBot.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdfview-0.9.3-CyBot.jar" SelfReg="false" NextFile="sigspades4.1.2.jar_1"/>
-    <ROW File="postInstall_win.bat" Component_="pdfover_linux.sh_1" FileName="postIn~1.bat|postInstall_win.bat" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\scripts\postInstall_win.bat" SelfReg="false"/>
-    <ROW File="sigspades4.1.2.jar_1" Component_="activation1.1.1.jar" FileName="sigs-p~1.jar|sigs-pades-4.1.2.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\sigs-pades-4.1.2.jar" SelfReg="false" NextFile="slf4japi1.6.6.jar_1"/>
-    <ROW File="slf4japi1.6.6.jar_1" Component_="activation1.1.1.jar" FileName="slf4j-~1.jar|slf4j-api-1.6.6.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\slf4j-api-1.6.6.jar" SelfReg="false" NextFile="slf4jlog4j121.6.6.jar_1"/>
-    <ROW File="slf4jlog4j121.6.6.jar_1" Component_="activation1.1.1.jar" FileName="slf4j-~2.jar|slf4j-log4j12-1.6.6.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\slf4j-log4j12-1.6.6.jar" SelfReg="false" NextFile="staxex1.7.8.jar_1"/>
-    <ROW File="staxex1.7.8.jar_1" Component_="activation1.1.1.jar" FileName="stax-e~1.jar|stax-ex-1.7.8.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\stax-ex-1.7.8.jar" SelfReg="false" NextFile="txw22.3.0.jar_1"/>
+    <ROW File="pdfovergui4.1.19.jar" Component_="commonslang33.3.2.jar" FileName="pdf-ov~1.jar|pdf-over-gui-4.1.19.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-over-gui-4.1.19.jar" SelfReg="false" NextFile="pdfoverinstallhelper1.0.0.jar"/>
+    <ROW File="pdfoverinstallhelper1.0.0.jar" Component_="commonslang33.3.2.jar" FileName="pdf-ov~2.jar|pdf-over-install-helper-1.0.0.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-over-install-helper-1.0.0.jar" SelfReg="false" NextFile="pdfoversignator4.1.19.jar"/>
+    <ROW File="pdfoversignator4.1.19.jar" Component_="commonslang33.3.2.jar" FileName="pdf-ov~3.jar|pdf-over-signator-4.1.19.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-over-signator-4.1.19.jar" SelfReg="false" NextFile="pdfoversigpdfas44.1.19.jar"/>
+    <ROW File="pdfoversigpdfas44.1.19.jar" Component_="commonslang33.3.2.jar" FileName="pdf-ov~4.jar|pdf-over-sigpdfas4-4.1.19.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-over-sigpdfas4-4.1.19.jar" SelfReg="false" NextFile="pdfview0.9.3CyBot.jar"/>
+    <ROW File="pdfview0.9.3CyBot.jar" Component_="commonslang33.3.2.jar" FileName="pdfvie~1.jar|pdfview-0.9.3-CyBot.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdfview-0.9.3-CyBot.jar" SelfReg="false" NextFile="sigspades4.1.3.jar"/>
+    <ROW File="sigspades4.1.3.jar" Component_="commonslang33.3.2.jar" FileName="sigs-p~1.jar|sigs-pades-4.1.3.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\sigs-pades-4.1.3.jar" SelfReg="false" NextFile="slf4japi1.6.6.jar"/>
+    <ROW File="slf4japi1.6.6.jar" Component_="commonslang33.3.2.jar" FileName="slf4j-~1.jar|slf4j-api-1.6.6.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\slf4j-api-1.6.6.jar" SelfReg="false" NextFile="slf4jlog4j121.6.6.jar"/>
+    <ROW File="slf4jlog4j121.6.6.jar" Component_="commonslang33.3.2.jar" FileName="slf4j-~2.jar|slf4j-log4j12-1.6.6.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\slf4j-log4j12-1.6.6.jar" SelfReg="false" NextFile="staxex1.7.8.jar"/>
+    <ROW File="staxex1.7.8.jar" Component_="commonslang33.3.2.jar" FileName="stax-e~1.jar|stax-ex-1.7.8.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\stax-ex-1.7.8.jar" SelfReg="false" NextFile="txw22.3.0.jar"/>
     <ROW File="swtwindows32.jar_1" Component_="swtwindows32.jar_1" FileName="swt-wi~1.jar|swt-windows-32.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib-swt\swt-windows-32.jar" SelfReg="false" NextFile="swtwindows64.jar_1"/>
     <ROW File="swtwindows64.jar_1" Component_="swtwindows32.jar_1" FileName="swt-wi~2.jar|swt-windows-64.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib-swt\swt-windows-64.jar" SelfReg="false" NextFile="ReadMe.txt_1"/>
-    <ROW File="txw22.3.0.jar_1" Component_="activation1.1.1.jar" FileName="txw2-2~1.jar|txw2-2.3.0.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\txw2-2.3.0.jar" SelfReg="false" NextFile="xmpcore5.1.2.jar_1"/>
-    <ROW File="xmpcore5.1.2.jar_1" Component_="activation1.1.1.jar" FileName="xmpcor~1.jar|xmpcore-5.1.2.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\xmpcore-5.1.2.jar" SelfReg="false" NextFile="swtwindows32.jar_1"/>
+    <ROW File="txw22.3.0.jar" Component_="commonslang33.3.2.jar" FileName="txw2-2~1.jar|txw2-2.3.0.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\txw2-2.3.0.jar" SelfReg="false" NextFile="xmpcore5.1.2.jar"/>
+    <ROW File="xmpcore5.1.2.jar" Component_="commonslang33.3.2.jar" FileName="xmpcor~1.jar|xmpcore-5.1.2.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\xmpcore-5.1.2.jar" SelfReg="false" NextFile="activation1.1.1.jar"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">
-    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" Languages="en;de" LangOpt="1" InstallationType="4" PackageType="1" UseLargeSchema="true"/>
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" Languages="en;de" LangOpt="1" InstallationType="4" UseLargeSchema="true" UACExecutionLevel="2"/>
     <ATTRIBUTE name="CurrentBuild" value="DefaultBuild"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
@@ -155,10 +156,10 @@
     <ATTRIBUTE name="FixedSizeBitmaps" value="2"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiControlConditionComponent">
-    <ROW Dialog_="ShortcutsDlg" Control_="StartupShorcutsCheckBox" Action="Hide" Condition="(Not Installed)"/>
     <ROW Dialog_="ShortcutsDlg" Control_="DesktopShortcutsCheckBox" Action="Show" Condition="(Not Installed)"/>
     <ROW Dialog_="ShortcutsDlg" Control_="StartmenuShortcutsCheckBox" Action="Show" Condition="(Not Installed)"/>
     <ROW Dialog_="ShortcutsDlg" Control_="QuickLaunchShorcutsCheckBox" Action="Show" Condition="(Not Installed) AND (VersionNT&lt;&quot;601&quot;)"/>
+    <ROW Dialog_="ShortcutsDlg" Control_="StartupShorcutsCheckBox" Action="Hide" Condition="(Not Installed)"/>
     <ATTRIBUTE name="DeletedRows" value="ShortcutsDlg#StartmenuShortcutsCheckBox#Show#(Not Installed)@ShortcutsDlg#StartupShorcutsCheckBox#Show#(Not Installed)@ShortcutsDlg#DesktopShortcutsCheckBox#Show#(Not Installed)@ShortcutsDlg#QuickLaunchShorcutsCheckBox#Show#(Not Installed) AND (VersionNT&lt;&quot;601&quot;)"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiControlEventComponent">
@@ -199,6 +200,7 @@
     <ROW Action="AI_DEL_EMPTY_SHORTCUTDIR" Type="3073" Source="aicustact.dll" Target="DeleteEmptyDirectory" AdditionalSeq="AI_DATA_SETTER"/>
     <ROW Action="AI_DOWNGRADE" Type="19" Target="4010"/>
     <ROW Action="AI_InstallModeCheck" Type="1" Source="aicustact.dll" Target="UpdateInstallMode" WithoutSeq="true"/>
+    <ROW Action="AI_LaunchApp" Type="1" Source="aicustact.dll" Target="[#pdfover_win.bat_1]"/>
     <ROW Action="AI_PREPARE_UPGRADE" Type="65" Source="aicustact.dll" Target="PrepareUpgrade"/>
     <ROW Action="AI_RESTORE_LOCATION" Type="65" Source="aicustact.dll" Target="RestoreLocation"/>
     <ROW Action="AI_ResolveKnownFolders" Type="1" Source="aicustact.dll" Target="AI_ResolveKnownFolders"/>
@@ -211,7 +213,6 @@
     <ROW Action="SET_TARGETDIR_TO_APPDIR" Type="51" Source="TARGETDIR" Target="[APPDIR]"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiIconsComponent">
-    <ROW Name="SystemFoldermsiexec.exe" SourcePath="&lt;AI_RES&gt;uninstall.ico" Index="0"/>
     <ROW Name="icon.exe" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\icons\icon.ico" Index="0"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiInstExSeqComponent">
@@ -236,7 +237,6 @@
     <ROW Condition="VersionNT" Description="[ProductName] cannot be installed on [WindowsType9XDisplay]" DescriptionLocId="AI.LaunchCondition.No9X" IsPredefined="true" Builds="DefaultBuild"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiLockPermComponent">
-    <ROW LockObject="pdfoverinstallhelper1.0.0.jar_1" Table="File" Domain="[%USERDOMAIN]" User="Domain Users" Permission="1880096767"/>
     <ROW LockObject="swtwindows32.jar_1" Table="File" Domain="[%USERDOMAIN]" User="Domain Users" Permission="1880096767"/>
     <ROW LockObject="swtwindows64.jar_1" Table="File" Domain="[%USERDOMAIN]" User="Domain Users" Permission="1880096767"/>
     <ROW LockObject="lib_1_Dir" Table="CreateFolder" Domain="[%USERDOMAIN]" User="Domain Users" Permission="1880096767"/>
@@ -257,7 +257,7 @@
     <ROW Shortcut="PDFOver_1" Directory_="DesktopFolder" Name="PDF-Over" Component_="pdfover_win.bat" Target="[#pdfover_win.bat_1]" Hotkey="0" Icon_="icon.exe" IconIndex="0" ShowCmd="1" WkDir="scripts_1_Dir"/>
     <ROW Shortcut="PDFOver_2" Directory_="SendToFolder" Name="PDF-Over" Component_="pdfover_win.bat" Target="[#pdfover_win.bat_1]" Hotkey="0" Icon_="icon.exe" IconIndex="0" ShowCmd="1" WkDir="scripts_1_Dir"/>
     <ROW Shortcut="PDFOver_3" Directory_="ProgramMenuFolder" Name="PDF-Over" Component_="pdfover_win.bat" Target="[#pdfover_win.bat_1]" Hotkey="0" Icon_="icon.exe" IconIndex="0" ShowCmd="1" WkDir="scripts_1_Dir"/>
-    <ROW Shortcut="UninstallPDFOver" Directory_="APPDIR" Name="Uninst~1|Uninstall-PDF-Over" Component_="AIShRegAnswer" Target="[SystemFolder]msiexec.exe" Arguments="/x [ProductCode]" Hotkey="0" Icon_="SystemFoldermsiexec.exe" IconIndex="0" ShowCmd="1"/>
+    <ROW Shortcut="UninstallPDFOver" Directory_="APPDIR" Name="Uninst~2|Uninstall PDF-Over" Component_="AIShRegAnswer" Target="[SystemFolder]msiexec.exe" Arguments="/x [ProductCode]" Hotkey="0" Icon_="icon.exe" IconIndex="0" ShowCmd="1"/>
     <ROW Shortcut="UninstallPDFOver_1" Directory_="SHORTCUTDIR" Name="Uninst~2|Uninstall PDF-Over" Component_="swtwindows32.jar_1" Target="[SystemFolder]msiexec.exe" Arguments="/x [ProductCode]" Hotkey="0" Icon_="icon.exe" IconIndex="0" ShowCmd="1"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiThemeComponent">
diff --git a/pdf-over-gui/pom.xml b/pdf-over-gui/pom.xml
index 4260fed8..57d16766 100644
--- a/pdf-over-gui/pom.xml
+++ b/pdf-over-gui/pom.xml
@@ -429,7 +429,7 @@
 		<project.maindir>${project.basedir}/..</project.maindir>
 		<target.name>windows</target.name>
 		<staging.dir>${project.build.directory}/staging/${target.name}</staging.dir>
-		<swt.version>4.3.2</swt.version>
+		<swt.version>4.7M3</swt.version>
 	</properties>
 
 	<profiles>
@@ -638,7 +638,7 @@
 	<repositories>
 		<repository>
 			<id>maven-eclipse-repo</id>
-			<url>http://maven-eclipse.github.io/maven</url>
+			<url>http://maven-eclipse.github.io/maven</url> 
 		</repository>
 	</repositories>
 </project>
diff --git a/pdf-over-install-helper/src/main/java/at/asit/helper/Main.java b/pdf-over-install-helper/src/main/java/at/asit/helper/Main.java
index 9f39db2c..d9156a92 100644
--- a/pdf-over-install-helper/src/main/java/at/asit/helper/Main.java
+++ b/pdf-over-install-helper/src/main/java/at/asit/helper/Main.java
@@ -32,7 +32,7 @@ public class Main {
 	
 
 	public static int getArchBits() {
-		String arch = System.getProperty("os.arch");
+		String arch = System.getProperty("sun.arch.data.model");
 		return arch.contains("64") ? 64 : 32;
 	}
 
-- 
cgit v1.2.3