Update Advanced Installer Project

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-over/trunk@442 174cde9d-5d70-4d2a-aa98-46368bc2aaf7

2 files changed, 24 insertions, 20 deletions

diff --git a/installer/README.txt b/installer/README.txt
index 688fa534..f79be2eb 100644
--- a/installer/README.txt
+++ b/installer/README.txt
@@ -8,6 +8,8 @@ Windows-Installer:
 	Advanced-Installer-Projektdateien enthalten:
 	* PDF-Over.aip - Einfaches MSI, mit Free-Version erzeugbar
 	* PDF-Over-signed.aip - Benötigt Pro-Version, signiert, Sprachen
+	* User Interface -> Dialogs -> ShortcutsDlg
+		* "Show Desktop Option" & "Checked by default" aktivieren
 
 Mac-DMG-Paket:
 	* Per webstart installieren, Paketinhalt entpacken
diff --git a/installer/windows/PDF-Over-signed.aip b/installer/windows/PDF-Over-signed.aip
index 50f6057d..d5b3b8d5 100644
--- a/installer/windows/PDF-Over-signed.aip
+++ b/installer/windows/PDF-Over-signed.aip
@@ -14,10 +14,10 @@
     <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="Manufacturer" Value="A-SIT (Secure Information Technology Center - Austria)"/>

-    <ROW Property="ProductCode" Value="1033:{F599ACAF-6236-4C40-B315-4098B670EDD2} 1031:{60F31DB2-DE68-4F4A-A88F-9F5CF84DE500} " Type="16"/>

+    <ROW Property="ProductCode" Value="1033:{71D4D964-AC6A-4875-A593-A0F844419C24} 1031:{A3C937B3-A672-4934-9EB2-AEA6E7C22819} " Type="16"/>

     <ROW Property="ProductLanguage" Value="1033"/>

     <ROW Property="ProductName" Value="PDF-Over"/>

-    <ROW Property="ProductVersion" Value="4.0.0" Type="32"/>

+    <ROW Property="ProductVersion" Value="4.0.1" Type="32"/>

     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>

     <ROW Property="UpgradeCode" Value="{4F146EA4-79F9-4873-9A4C-A66A525AF62F}"/>

     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>

@@ -35,22 +35,23 @@
   </COMPONENT>

   <COMPONENT cid="caphyon.advinst.msicomp.MsiCompsComponent">

     <ROW Component="AIShRegAnswer" ComponentId="{19C5B0EB-63C2-4BE4-B2C8-B5EFC6393279}" Directory_="APPDIR" Attributes="4" KeyPath="AIShRegAnswer"/>

-    <ROW Component="PDFOver.exe" ComponentId="{60642A97-7B5B-41D6-94CB-42074F600850}" Directory_="APPDIR" Attributes="0" KeyPath="PDFOver.exe"/>

-    <ROW Component="PDFOver.ini" ComponentId="{21452EE3-1B6C-4C9F-9B71-80F73B675B18}" Directory_="APPDIR" Attributes="0" KeyPath="PDFOver.ini" Type="0"/>

+    <ROW Component="PDFOver.exe" ComponentId="{21AF1E6B-2154-42F3-84E1-496EEDB15CD0}" Directory_="APPDIR" Attributes="0" KeyPath="PDFOver.exe"/>

+    <ROW Component="PDFOvercli.exe" ComponentId="{75ADBB0C-A267-4C8F-B5A0-124F120C1174}" Directory_="APPDIR" Attributes="0" KeyPath="PDFOvercli.exe"/>

     <ROW Component="ProductInformation" ComponentId="{8126D538-2928-475F-8DBB-9BFB1EB29D9F}" Directory_="APPDIR" Attributes="4" KeyPath="Version"/>

-    <ROW Component="SHORTCUTDIR" ComponentId="{5B334D06-0B46-4A9D-9B3E-BF73A7410589}" Directory_="SHORTCUTDIR" Attributes="0"/>

-    <ROW Component="axis1.0.jar" ComponentId="{8C581EA4-51D8-48AC-8FA8-8445673BC5AA}" Directory_="lib_Dir" Attributes="0" KeyPath="axis1.0.jar" Type="0"/>

+    <ROW Component="ReadMe.txt" ComponentId="{6B219988-85AA-46D3-B6A6-9BF7FBC7C381}" Directory_="APPDIR" Attributes="0" KeyPath="ReadMe.txt" Type="0"/>

+    <ROW Component="SHORTCUTDIR" ComponentId="{064E7424-083A-428F-A6BE-309C263AE208}" Directory_="SHORTCUTDIR" Attributes="0"/>

+    <ROW Component="axis1.0.jar" ComponentId="{5C24981D-3325-4A37-B0C6-BBE796D9316B}" Directory_="lib_Dir" Attributes="0" KeyPath="axis1.0.jar" Type="0"/>

     <ROW Component="icon.ico" ComponentId="{D8E8BCE8-7FC0-4C55-9DAA-5BC40E88CBA4}" Directory_="icons_Dir" Attributes="0" KeyPath="icon.ico" Type="0"/>

     <ROW Component="swtwindows32.jar" ComponentId="{3DBC73A4-AC6C-4DB9-B66A-20845DFABF72}" Directory_="libswt_Dir" Attributes="0" KeyPath="swtwindows32.jar" 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 PDFOver.exe PDFOver.ini ProductInformation SHORTCUTDIR axis1.0.jar icon.ico swtwindows32.jar"/>

+    <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AIShRegAnswer PDFOver.exe PDFOvercli.exe ProductInformation ReadMe.txt SHORTCUTDIR axis1.0.jar icon.ico swtwindows32.jar"/>

     <ATTRIBUTE name="CurrentFeature" value="MainFeature"/>

   </COMPONENT>

   <COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent">

-    <ROW File="PDFOver.exe" Component_="PDFOver.exe" FileName="PDF-Over.exe" Attributes="0" SourcePath="C:\Programme\PDF-Over\PDF-Over.exe" SelfReg="false" NextFile="PDFOver.ini"/>

-    <ROW File="PDFOver.ini" Component_="PDFOver.ini" FileName="PDF-Over.ini" Attributes="0" SourcePath="C:\Programme\PDF-Over\PDF-Over.ini" SelfReg="false" NextFile="ReadMe.txt"/>

-    <ROW File="ReadMe.txt" Component_="PDFOver.ini" FileName="ReadMe.txt" Attributes="0" SourcePath="C:\Programme\PDF-Over\ReadMe.txt" SelfReg="false" NextFile="axis1.0.jar"/>

+    <ROW File="PDFOver.exe" Component_="PDFOver.exe" FileName="PDF-Over.exe" Attributes="0" SourcePath="C:\Programme\PDF-Over\PDF-Over.exe" SelfReg="false" NextFile="PDFOvercli.exe"/>

+    <ROW File="PDFOvercli.exe" Component_="PDFOvercli.exe" FileName="PDF-Ov~1.exe|PDF-Over-cli.exe" Attributes="0" SourcePath="C:\Programme\PDF-Over\PDF-Over-cli.exe" SelfReg="false"/>

+    <ROW File="ReadMe.txt" Component_="ReadMe.txt" FileName="ReadMe.txt" Attributes="0" SourcePath="C:\Programme\PDF-Over\ReadMe.txt" SelfReg="false" NextFile="PDFOver.exe"/>

     <ROW File="axis1.0.jar" Component_="axis1.0.jar" FileName="axis-1~1.jar|axis-1.0.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib\axis-1.0.jar" SelfReg="false" NextFile="axisjaxrpc1.0.jar"/>

     <ROW File="axisjaxrpc1.0.jar" Component_="axis1.0.jar" FileName="axis-j~1.jar|axis-jaxrpc-1.0.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib\axis-jaxrpc-1.0.jar" SelfReg="false" NextFile="axissaaj1.0.jar"/>

     <ROW File="axissaaj1.0.jar" Component_="axis1.0.jar" FileName="axis-s~1.jar|axis-saaj-1.0.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib\axis-saaj-1.0.jar" SelfReg="false" NextFile="axiswsdl4j1.0.jar"/>

@@ -72,9 +73,10 @@
     <ROW File="icon24x24.png" Component_="icon.ico" FileName="icon24~1.png|icon24x24.png" Attributes="0" SourcePath="C:\Programme\PDF-Over\icons\icon24x24.png" SelfReg="false" NextFile="icon32x32.png"/>

     <ROW File="icon32x32.png" Component_="icon.ico" FileName="icon32~1.png|icon32x32.png" Attributes="0" SourcePath="C:\Programme\PDF-Over\icons\icon32x32.png" SelfReg="false" NextFile="icon48x48.png"/>

     <ROW File="icon48x48.png" Component_="icon.ico" FileName="icon48~1.png|icon48x48.png" Attributes="0" SourcePath="C:\Programme\PDF-Over\icons\icon48x48.png" SelfReg="false" NextFile="icon96x96.png"/>

-    <ROW File="icon96x96.png" Component_="icon.ico" FileName="icon96~1.png|icon96x96.png" Attributes="0" SourcePath="C:\Programme\PDF-Over\icons\icon96x96.png" SelfReg="false" NextFile="PDFOver.exe"/>

+    <ROW File="icon96x96.png" Component_="icon.ico" FileName="icon96~1.png|icon96x96.png" Attributes="0" SourcePath="C:\Programme\PDF-Over\icons\icon96x96.png" SelfReg="false" NextFile="axis1.0.jar"/>

     <ROW File="itext2.1.5rev3628pdfas1.1.jar" Component_="axis1.0.jar" FileName="itext-~1.jar|itext-2.1.5-rev3628-pdfas-1.1.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib\itext-2.1.5-rev3628-pdfas-1.1.jar" SelfReg="false" NextFile="javase1.6SNAPSHOT.jar"/>

-    <ROW File="javase1.6SNAPSHOT.jar" Component_="axis1.0.jar" FileName="javase~1.jar|javase-1.6-SNAPSHOT.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib\javase-1.6-SNAPSHOT.jar" SelfReg="false" NextFile="jempbox0.8.0incubator.jar"/>

+    <ROW File="javase1.6SNAPSHOT.jar" Component_="axis1.0.jar" FileName="javase~1.jar|javase-1.6-SNAPSHOT.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib\javase-1.6-SNAPSHOT.jar" SelfReg="false" NextFile="jbig21.0.jar"/>

+    <ROW File="jbig21.0.jar" Component_="axis1.0.jar" FileName="jbig2-~1.jar|jbig2-1.0.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib\jbig2-1.0.jar" SelfReg="false" NextFile="jempbox0.8.0incubator.jar"/>

     <ROW File="jempbox0.8.0incubator.jar" Component_="axis1.0.jar" FileName="jempbo~1.jar|jempbox-0.8.0-incubator.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib\jempbox-0.8.0-incubator.jar" SelfReg="false" NextFile="junit3.8.1.jar"/>

     <ROW File="junit3.8.1.jar" Component_="axis1.0.jar" FileName="junit-~1.jar|junit-3.8.1.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib\junit-3.8.1.jar" SelfReg="false" NextFile="log4j1.2.17.jar"/>

     <ROW File="log4j1.2.17.jar" Component_="axis1.0.jar" FileName="log4j-~1.jar|log4j-1.2.17.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib\log4j-1.2.17.jar" SelfReg="false" NextFile="lucene1.4.3.jar"/>

@@ -83,10 +85,10 @@
     <ROW File="ognl2.6.9.jar" Component_="axis1.0.jar" FileName="ognl-2~1.jar|ognl-2.6.9.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib\ognl-2.6.9.jar" SelfReg="false" NextFile="pdfas3.2.jar"/>

     <ROW File="pdfas3.2.jar" Component_="axis1.0.jar" FileName="pdf-as~1.jar|pdf-as-3.2.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib\pdf-as-3.2.jar" SelfReg="false" NextFile="pdfbox0.7.2pdfas1.1.jar"/>

     <ROW File="pdfbox0.7.2pdfas1.1.jar" Component_="axis1.0.jar" FileName="pdfbox~1.jar|pdfbox-0.7.2-pdfas-1.1.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib\pdfbox-0.7.2-pdfas-1.1.jar" SelfReg="false" NextFile="pdfbox0.8.0incubating.jar"/>

-    <ROW File="pdfbox0.8.0incubating.jar" Component_="axis1.0.jar" FileName="pdfbox~2.jar|pdfbox-0.8.0-incubating.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib\pdfbox-0.8.0-incubating.jar" SelfReg="false" NextFile="pdfovergui4.0.0.jar"/>

-    <ROW File="pdfovergui4.0.0.jar" Component_="axis1.0.jar" FileName="pdf-ov~1.jar|pdf-over-gui-4.0.0.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib\pdf-over-gui-4.0.0.jar" SelfReg="false" NextFile="pdfoversignator4.0.0.jar"/>

-    <ROW File="pdfoversignator4.0.0.jar" Component_="axis1.0.jar" FileName="pdf-ov~2.jar|pdf-over-signator-4.0.0.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib\pdf-over-signator-4.0.0.jar" SelfReg="false" NextFile="pdfoversigpdfas4.0.0.jar"/>

-    <ROW File="pdfoversigpdfas4.0.0.jar" Component_="axis1.0.jar" FileName="pdf-ov~3.jar|pdf-over-sigpdfas-4.0.0.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib\pdf-over-sigpdfas-4.0.0.jar" SelfReg="false" NextFile="pdfview0.9.2Borisvl.jar"/>

+    <ROW File="pdfbox0.8.0incubating.jar" Component_="axis1.0.jar" FileName="pdfbox~2.jar|pdfbox-0.8.0-incubating.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib\pdfbox-0.8.0-incubating.jar" SelfReg="false" NextFile="pdfovergui4.0.1SNAPSHOT.jar"/>

+    <ROW File="pdfovergui4.0.1SNAPSHOT.jar" Component_="axis1.0.jar" FileName="pdf-ov~1.jar|pdf-over-gui-4.0.1-SNAPSHOT.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib\pdf-over-gui-4.0.1-SNAPSHOT.jar" SelfReg="false" NextFile="pdfoversignator4.0.1SNAPSHOT.jar"/>

+    <ROW File="pdfoversignator4.0.1SNAPSHOT.jar" Component_="axis1.0.jar" FileName="pdf-ov~2.jar|pdf-over-signator-4.0.1-SNAPSHOT.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib\pdf-over-signator-4.0.1-SNAPSHOT.jar" SelfReg="false" NextFile="pdfoversigpdfas4.0.1SNAPSHOT.jar"/>

+    <ROW File="pdfoversigpdfas4.0.1SNAPSHOT.jar" Component_="axis1.0.jar" FileName="pdf-ov~3.jar|pdf-over-sigpdfas-4.0.1-SNAPSHOT.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib\pdf-over-sigpdfas-4.0.1-SNAPSHOT.jar" SelfReg="false" NextFile="pdfview0.9.2Borisvl.jar"/>

     <ROW File="pdfview0.9.2Borisvl.jar" Component_="axis1.0.jar" FileName="pdfvie~1.jar|pdfview-0.9.2-Borisvl.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib\pdfview-0.9.2-Borisvl.jar" SelfReg="false" NextFile="servletapi2.4.jar"/>

     <ROW File="servletapi2.4.jar" Component_="axis1.0.jar" FileName="servle~1.jar|servlet-api-2.4.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib\servlet-api-2.4.jar" SelfReg="false" NextFile="slf4japi1.6.6.jar"/>

     <ROW File="slf4japi1.6.6.jar" Component_="axis1.0.jar" FileName="slf4j-~1.jar|slf4j-api-1.6.6.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib\slf4j-api-1.6.6.jar" SelfReg="false" NextFile="slf4jlog4j121.6.6.jar"/>

@@ -94,7 +96,7 @@
     <ROW File="swtwindows32.jar" Component_="swtwindows32.jar" FileName="swt-wi~1.jar|swt-windows-32.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib-swt\swt-windows-32.jar" SelfReg="false" NextFile="swtwindows64.jar"/>

     <ROW File="swtwindows64.jar" Component_="swtwindows32.jar" FileName="swt-wi~2.jar|swt-windows-64.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib-swt\swt-windows-64.jar" SelfReg="false" NextFile="icon.ico"/>

     <ROW File="xercesImpl2.7.1.jar" Component_="axis1.0.jar" FileName="xerces~1.jar|xercesImpl-2.7.1.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib\xercesImpl-2.7.1.jar" SelfReg="false" NextFile="xmlapis1.3.02.jar"/>

-    <ROW File="xmlapis1.3.02.jar" Component_="axis1.0.jar" FileName="xml-ap~1.jar|xml-apis-1.3.02.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib\xml-apis-1.3.02.jar" SelfReg="false"/>

+    <ROW File="xmlapis1.3.02.jar" Component_="axis1.0.jar" FileName="xml-ap~1.jar|xml-apis-1.3.02.jar" Attributes="0" SourcePath="C:\Programme\PDF-Over\lib\xml-apis-1.3.02.jar" SelfReg="false" NextFile="ReadMe.txt"/>

   </COMPONENT>

   <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">

     <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" Languages="en;de" LangOpt="1" InstallationType="4" UseLargeSchema="true"/>

@@ -222,9 +224,9 @@
     <ROW Registry="Version" Root="-1" Key="Software\[Manufacturer]\[ProductName]" Name="Version" Value="[ProductVersion]" Component_="ProductInformation"/>

   </COMPONENT>

   <COMPONENT cid="caphyon.advinst.msicomp.MsiShortsComponent">

-    <ROW Shortcut="PDFOver" Directory_="SendToFolder" Name="PDF-Over" Component_="PDFOver.exe" Target="[#PDFOver.exe]" Hotkey="0" IconIndex="0" ShowCmd="1" WkDir="APPDIR"/>

-    <ROW Shortcut="PDFOver_1" Directory_="SHORTCUTDIR" Name="PDF-Over" Component_="PDFOver.exe" Target="[#PDFOver.exe]" Hotkey="0" IconIndex="0" ShowCmd="1" WkDir="APPDIR"/>

-    <ROW Shortcut="PDFOver_2" Directory_="DesktopFolder" Name="PDF-Over" Component_="PDFOver.exe" Target="[#PDFOver.exe]" Hotkey="0" IconIndex="0" ShowCmd="1" WkDir="APPDIR"/>

+    <ROW Shortcut="PDFOver" Directory_="DesktopFolder" Name="PDF-Over" Component_="PDFOver.exe" Target="[#PDFOver.exe]" Hotkey="0" IconIndex="0" ShowCmd="1" WkDir="APPDIR"/>

+    <ROW Shortcut="PDFOver_1" Directory_="SendToFolder" Name="PDF-Over" Component_="PDFOver.exe" Target="[#PDFOver.exe]" Hotkey="0" IconIndex="0" ShowCmd="1" WkDir="APPDIR"/>

+    <ROW Shortcut="PDFOver_2" Directory_="SHORTCUTDIR" Name="PDF-Over" Component_="PDFOver.exe" Target="[#PDFOver.exe]" Hotkey="0" IconIndex="0" ShowCmd="1" WkDir="APPDIR" Advertised="true"/>

   </COMPONENT>

   <COMPONENT cid="caphyon.advinst.msicomp.MsiThemeComponent">

     <ATTRIBUTE name="UsedTheme" value="classic"/>