[java-identity-provider] 01/12: IDP-2147 Investigate Wix V4
Rod Widdowson
rdw at steadingsoftware.com
Tue Apr 9 12:28:54 UTC 2024
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch dev/IDP-2147
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=6d55fdabd4e4f4107311de48f4fab7c3c6de691a
commit 6d55fdabd4e4f4107311de48f4fab7c3c6de691a
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Nov 7 15:36:48 2023 +0000
IDP-2147 Investigate Wix V4
https://shibboleth.atlassian.net/browse/IDP-2147
Initial commit of unchanged wix sources (including
suuplemetary files)
---
idp-msi/src/main/wix/.gitignore | 8 ++
idp-msi/src/main/wix/Dialog.bmp | Bin 0 -> 472310 bytes
.../src/main/wix/ShibbolethIdP-adconfig-dlg.wxs | 73 ++++++++++++
idp-msi/src/main/wix/ShibbolethIdP-delete.wxs | 35 ++++++
idp-msi/src/main/wix/ShibbolethIdP-gui.wxs | 122 +++++++++++++++++++++
idp-msi/src/main/wix/ShibbolethIdP-install-dlg.wxs | 79 +++++++++++++
idp-msi/src/main/wix/ShibbolethIdP-main.wxs | 116 ++++++++++++++++++++
idp-msi/src/main/wix/ShibbolethIdP-registry.wxs | 44 ++++++++
idp-msi/src/main/wix/ShibbolethIdP-update-dlg.wxs | 46 ++++++++
idp-msi/src/main/wix/ShibbolethIdP-warn-dlg.wxs | 50 +++++++++
idp-msi/src/main/wix/TopBanner.bmp | Bin 0 -> 94556 bytes
idp-msi/src/main/wix/license.rtf | 38 +++++++
.../src/main/wix/scripts/shib_write_configs.vbs | 120 ++++++++++++++++++++
idp-msi/src/main/wix/shib.ico | Bin 0 -> 3638 bytes
14 files changed, 731 insertions(+)
diff --git a/idp-msi/src/main/wix/.gitignore b/idp-msi/src/main/wix/.gitignore
new file mode 100644
index 000000000..13e3f189d
--- /dev/null
+++ b/idp-msi/src/main/wix/.gitignore
@@ -0,0 +1,8 @@
+/*.msi
+/*.msm
+/*.suo
+*.zip
+*.zip.asc
+*.wixobj
+*.wixpdb
+/bin
diff --git a/idp-msi/src/main/wix/Dialog.bmp b/idp-msi/src/main/wix/Dialog.bmp
new file mode 100644
index 000000000..4d50f2e1d
Binary files /dev/null and b/idp-msi/src/main/wix/Dialog.bmp differ
diff --git a/idp-msi/src/main/wix/ShibbolethIdP-adconfig-dlg.wxs b/idp-msi/src/main/wix/ShibbolethIdP-adconfig-dlg.wxs
new file mode 100644
index 000000000..529f903a8
--- /dev/null
+++ b/idp-msi/src/main/wix/ShibbolethIdP-adconfig-dlg.wxs
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an 'AS IS' BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied. See the License for the specific language governing
+ permissions and limitations under the License. -->
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <!-- This file contains the description of the dialog which captures installation
+ values for first time installs -->
+ <Fragment>
+
+ <UI>
+
+ <!-- This Dialog sets up:
+
+ AD_DOMAIN
+ AD_USER
+ AD_PASS
+ AD_USE_GC
+
+ -->
+
+ <Dialog Id="ConfigADDlg" Width="370" Height="270" Title="[ProductName] Setup">
+ <!-- Stuff at the top: picture, some text, a line -->
+ <Control Id="TopBitMap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" Text="WixUI_Bmp_Banner" />
+ <Control Id="TopInfo" Type="Text" X="15" Y="6" Width="150" Height="12" Text="{\WixUI_Font_Title}Configure for Active Directory" Transparent="yes" />
+ <Control Id="TopDetailed" Type="Text" X="25" Y="24" Width="320" Height="12" Text="This will set up the ldap options for authorization and attribute resolution" Transparent="yes" />
+ <Control Id="TopLine" Type="Line" X="0" Y="44" Width="370" Height="1" />
+
+
+ <Control Id="ADDescriptionLine1" Type="Text" X="25" Y="51" Height="18" Width="320" Text="Fill in details about your Active Directory Install" />
+
+
+ <Control Id="ADDescriptionLine2" Type="Text" X="25" Y="71" Height="18" Width="150" Text="Specify the Active Directory Domain" />
+ <Control Id="ADDomain" Type="Edit" X="185" Y="71" Height="18" Width="150" Property="AD_DOMAIN" Text="[AD_DOMAIN]" />
+
+ <Control Id="UseGC" Type="CheckBox" X="25" Y="91" Height="18" Width="150" Property="AD_USE_GC" CheckBoxValue="TRUE" Text="Use Global Catalog" />
+
+ <Control Id="ADDescriptionLine3" Type="Text" X="25" Y="111" Height="18" Width="320" Text="In order to resolve attributes, the IdP needs a username/password for Active Directory" />
+
+ <Control Id="ADDescriptionLine4" Type="Text" X="25" Y="131" Height="18" Width="150" Text="User Principal Name (UPN)" />
+ <Control Id="ADUser" Type="Edit" X="185" Y="131" Height="18" Width="150" Property="AD_USER" Text="[AD_USER]" />
+
+
+ <Control Id="ADDescriptionLine5" Type="Text" X="25" Y="151" Height="18" Width="150" Text="Password" />
+ <Control Id="ADPASS" Type="Edit" X="185" Y="151" Height="18" Width="150" Password="yes" Sunken="no" Property="AD_PASS" Text="[AD_PASS]" />
+
+ <!-- Stuff at the bottom: line, Back,Next, [space] Cancel -->
+ <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="1" />
+ <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&Back">
+ <Publish Event="NewDialog" Value="InstallDirDlgShib">1</Publish>
+ </Control>
+
+ <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Text="&Next" Default="yes">
+ <Publish Event="NewDialog" Value="WarnDlgShib">1</Publish>
+ </Control>
+
+ <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Text="&Cancel" Cancel="yes">
+ <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+ </Control>
+ </Dialog>
+
+ </UI>
+ </Fragment>
+</Wix>
diff --git a/idp-msi/src/main/wix/ShibbolethIdP-delete.wxs b/idp-msi/src/main/wix/ShibbolethIdP-delete.wxs
new file mode 100644
index 000000000..305e1cb23
--- /dev/null
+++ b/idp-msi/src/main/wix/ShibbolethIdP-delete.wxs
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an 'AS IS' BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied. See the License for the specific language governing
+ permissions and limitations under the License. -->
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+ <!-- Explicit delete behind ourselves on installs -->
+ <Fragment>
+ <Component Id="DeleteFiles" Guid="{923639F2-93DB-4A07-A864-BB6857257900}" Win64="no" Directory="INSTALLDIR">
+ <RegistryValue Id="RemoveOldWebApp" Root="HKLM" Key="SOFTWARE\Shibboleth\IdP" Name="RemoveOldWebApp" Value="TRUE" Type="string" KeyPath="yes" />
+ <util:RemoveFolderEx On="install" Property="OldWebAPP" />
+ <util:RemoveFolderEx On="install" Property="OldSystem" />
+ <util:RemoveFolderEx On="install" Property="OldBinLib" />
+ </Component>
+
+ <CustomAction Id="SetOldSystem" Property="OldSystem" Value="[INSTALLDIR]\System" />
+ <CustomAction Id="SetOldWebApp" Property="OldWebAPP" Value="[INSTALLDIR]\WebApp" />
+ <CustomAction Id="SetOldBinLib" Property="OldBinLib" Value="[INSTALLDIR]\bin\lib" />
+
+ <InstallExecuteSequence>
+ <Custom Action="SetOldSystem" After="WixRemoveFoldersEx" />
+ <Custom Action="SetOldWebApp" After="WixRemoveFoldersEx" />
+ <Custom Action="SetOldBinLib" After="WixRemoveFoldersEx" />
+ </InstallExecuteSequence>
+
+ </Fragment>
+</Wix>
diff --git a/idp-msi/src/main/wix/ShibbolethIdP-gui.wxs b/idp-msi/src/main/wix/ShibbolethIdP-gui.wxs
new file mode 100644
index 000000000..81bd9dce5
--- /dev/null
+++ b/idp-msi/src/main/wix/ShibbolethIdP-gui.wxs
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an 'AS IS' BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied. See the License for the specific language governing
+ permissions and limitations under the License. -->
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" >
+<!-- This file controls the dispaying of the GUI dialogs (both WiX and custom) -->
+ <Fragment>
+ <WixVariable Id="WixUILicenseRtf" Value="$(var.ProjectDir)\license.rtf" />
+ <WixVariable Id="WixUIBannerBmp" Value="$(var.ProjectDir)\TopBanner.bmp" />
+ <WixVariable Id="WixUIDialogBmp" Value="$(var.ProjectDir)\Dialog.bmp" />
+ <WixVariable Id="WixUICostingPopupOptOut" Value="1" />
+
+ <!-- GUI For Shibboleth installer. Uses the Wix packages, but linked in
+ blindly by looking at documentation (for sizes and dialog names)
+ and the generated.msi -->
+
+ <!-- Property that Light complained for -->
+ <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
+
+ <!-- "You must set a property named WIXUI_INSTALLDIR with a value
+ of the ID of the directory you want the user to be able to specify
+ the location of." -->
+
+ <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
+
+ <UI Id="ShibbolethInstallDir">
+
+ <!-- "WixUI_InstallDir includes the following dialogs:" -->
+ <DialogRef Id="BrowseDlg" />
+ <DialogRef Id="DiskCostDlg" />
+ <DialogRef Id="InvalidDirDlg" />
+ <DialogRef Id="LicenseAgreementDlg" />
+ <DialogRef Id="WelcomeDlg" />
+
+ <!-- "In addition, WixUI_InstallDir includes the following common
+ dialogs that appear in all WixUI dialog sets:" -->
+ <DialogRef Id="CancelDlg" />
+ <DialogRef Id="ErrorDlg" />
+ <DialogRef Id="ExitDialog" />
+ <DialogRef Id="FatalError" />
+ <DialogRef Id="FilesInUse" />
+ <DialogRef Id="MaintenanceTypeDlg" />
+ <DialogRef Id="MaintenanceWelcomeDlg" />
+ <DialogRef Id="MsiRMFilesInUse" />
+ <DialogRef Id="OutOfDiskDlg" />
+ <DialogRef Id="OutOfRbDiskDlg" />
+ <DialogRef Id="PrepareDlg" />
+ <DialogRef Id="ProgressDlg" />
+ <DialogRef Id="ResumeDlg" />
+ <DialogRef Id="UserExit" />
+ <DialogRef Id="VerifyReadyDlg" />
+ <DialogRef Id="WaitForCostingDlg" />
+
+ <!-- We also define two dialogs -->
+ <DialogRef Id="UpdateDlgShib" />
+ <DialogRef Id="InstallDirDlgShib" />
+ <DialogRef Id="ConfigADDlg" />
+
+ <!-- Text Styles (from Orca) -->
+ <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
+ <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
+ <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
+
+ <!-- Events (from Orca\ControlEvent and from light"s complaints) -->
+ <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="3">1</Publish>
+ <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4">
+ WIXUI_INSTALLDIR_VALID<>"1"
+ </Publish>
+
+ <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="InstallDirDlgShib">
+ LicenseAccepted = "1"
+ </Publish>
+
+ <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+ <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+
+ <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
+
+ <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="LicenseAgreementDlg">
+ (NOT Installed) AND (NOT ALREADYINSTALLED)
+ </Publish>
+ <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="UpdateDlgShib">
+ (NOT Installed) AND ALREADYINSTALLED
+ </Publish>
+ <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">
+ Installed AND PATCH
+ </Publish>
+
+ <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return">1</Publish>
+ <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
+ <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">
+ Installed AND PATCH
+ </Publish>
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="ConfigADDlg">
+ (NOT Installed) AND (NOT ALREADYINSTALLED) AND CONFIGURE_AD="TRUE"
+ </Publish>
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="InstallDirDlgShib">
+ (NOT Installed) AND (NOT ALREADYINSTALLED) AND CONFIGURE_AD <>"TRUE"
+ </Publish>
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="UpdateDlgShib">
+ (NOT Installed) AND ALREADYINSTALLED
+ </Publish>
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg">
+ Installed AND NOT PATCH
+ </Publish>
+
+ <ProgressText Action="QtIdpInstall">Performing IdP Installation tasks; this may take some time.</ProgressText>
+
+ </UI>
+ </Fragment>
+</Wix>
diff --git a/idp-msi/src/main/wix/ShibbolethIdP-install-dlg.wxs b/idp-msi/src/main/wix/ShibbolethIdP-install-dlg.wxs
new file mode 100644
index 000000000..77253aa3a
--- /dev/null
+++ b/idp-msi/src/main/wix/ShibbolethIdP-install-dlg.wxs
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an 'AS IS' BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied. See the License for the specific language governing
+ permissions and limitations under the License. -->
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <!-- This file contains the description of the dialog which captures installation
+ values for first time installs -->
+ <Fragment>
+
+ <UI>
+
+ <TextStyle Id="JettyWarning_Font" Bold="yes" Red="200" Green="0" Blue="0" Size="8" FaceName="Tahoma"/>
+
+ <!-- This Dialog sets up:
+ - INSTALLDIR
+ - CONFIGURE_AD (and as a result selects the AD page or not)
+ -->
+
+ <Dialog Id="InstallDirDlgShib" Width="370" Height="270" Title="[ProductName] Setup">
+ <!-- Stuff at the top: picture, some text, a line -->
+ <Control Id="TopBitMap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" Text="WixUI_Bmp_Banner" />
+ <Control Id="TopInfo" Type="Text" X="15" Y="6" Width="150" Height="12" Text="{\WixUI_Font_Title}Configure Shibboleth" Transparent="yes" />
+ <Control Id="TopDetailed" Type="Text" X="25" Y="24" Width="320" Height="12" Text="Please choose where to install the Shibboleth IdP and other installation options" Transparent="yes" />
+ <Control Id="TopLine" Type="Line" X="0" Y="44" Width="370" Height="1" />
+
+ <!-- Buttons to control Shibboleth Setup -->
+ <Control Id="DescriptionLine1" Type="Text" X="25" Y="51" Height="12" Width="320" Text="The files for [ProductName] will be installed in the following folder." />
+
+ <!-- Where? -->
+ <Control Id="Dest" Type="Edit" X="25" Y="71" Width="228" Height="17" Property="INSTALLDIR" Text="[INSTALLDIR]" />
+ <Control Id="ChangeFolder" Type="PushButton" X="265" Y="71" Height="17" Width="56" Text="B&rowse...">
+ <Publish Event="SpawnDialog" Value="BrowseDlg" Order="1">1</Publish>
+ <Publish Event="[_BrowseProperty]" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
+ </Control>
+
+ <!-- AD? -->
+ <Control Id="ConfigureAD" Type="CheckBox" X="25" Y="92" Height="20" Width="150" Property="CONFIGURE_AD" CheckBoxValue="TRUE" Text="Configure for &Active Directory" />
+
+ <Control Id="DescriptionLine4" Type="Text" X="25" Y="128" Height="36" Width="150" Text="Choose the hostname (including domain) for this IdP. It will be used to generate the Certificates and Metadata" />
+ <Control Id="DnsName" Type="Edit" X="185" Y="132" Height="17" Width="150" Property="DNSNAME" Text="[DNSNAME]" />
+
+ <Control Id="DescriptionLine5" Type="Text" X="25" Y="168" Height="36" Width="150" Text="Choose the scope that this IdP will assert. If present this will be used to create the EntityID " />
+ <Control Id="IdpScope" Type="Edit" X="185" Y="172" Height="17" Width="150" Property="IDP_SCOPE" Text="[IDP_SCOPE]" />
+
+ <!-- Stuff at the bottom: line, Back,Next, [space] Cancel -->
+ <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="1" />
+ <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&Back">
+ <Publish Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>
+ </Control>
+
+ <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Text="&Next" Default="yes">
+ <Publish Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]">1</Publish>
+ <Publish Event="DoAction" Value="WixUIValidatePath">NOT WIXUI_DONTVALIDATEPATH</Publish>
+ <Publish Event="SpawnDialog" Value="InvalidDirDlg">NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"</Publish>
+ <Publish Event="NewDialog" Value="WarnDlgShib">
+ (WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1") AND CONFIGURE_AD <>"TRUE"
+ </Publish>
+ <Publish Event="NewDialog" Value="ConfigADDlg">
+ (WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1") AND CONFIGURE_AD="TRUE"
+ </Publish>
+ </Control>
+
+ <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Text="&Cancel" Cancel="yes">
+ <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+ </Control>
+ </Dialog>
+
+ </UI>
+ </Fragment>
+</Wix>
diff --git a/idp-msi/src/main/wix/ShibbolethIdP-main.wxs b/idp-msi/src/main/wix/ShibbolethIdP-main.wxs
new file mode 100644
index 000000000..c24696b94
--- /dev/null
+++ b/idp-msi/src/main/wix/ShibbolethIdP-main.wxs
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an 'AS IS' BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied. See the License for the specific language governing
+ permissions and limitations under the License. -->
+
+<?define UpgradeUUID="8d3bfb53-47ff-4cbc-9363-cbf9e46bedc4"?>
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <Product Id="*" Name="Shibboleth IdP V5" Language="1033" Version="5.0.0.0" Manufacturer="The Shibboleth Consortium" UpgradeCode="$(var.UpgradeUUID)">
+ <Package InstallerVersion="310" Compressed="yes" InstallScope="perMachine" Platform="x64" Description="Shibboleth IdP V5" Manufacturer="The Shibboleth Consortium" />
+
+ <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." AllowSameVersionUpgrades="yes" Schedule="afterInstallInitialize" />
+ <MediaTemplate EmbedCab="yes" />
+
+ <Condition Message="C run time libraray not installed">UCRTBASE_DLL</Condition>
+ <Condition Message="JDK not installed">JAVA_EXECUTABLE</Condition>
+
+ <!-- Information for the properties page of the msi -->
+
+ <Property Id="ARPCONTACT" Value="contact at shibboleth.net" />
+ <Property Id="ARPHELPLINK" Value="https://shibboleth.atlassian.net/wiki/spaces/IDP5/pages/3199500769/WindowsInstallation" />
+ <Property Id="ARPURLUPDATEINFO" Value=" https://wiki.shibboleth.net/confluence/display/IDP5/Installation#Installation-WindowsInstallation" />
+ <Property Id="ARPURLINFOABOUT" Value="http://shibboleth.net/" />
+ <Property Id="ARPNOMODIFY" Value="TRUE" />
+
+ <Feature Id="ProductFeature" Title="IdP" Level="1">
+ <ComponentRef Id="DeleteFiles" />
+ <ComponentGroupRef Id="IdPGroup" />
+ <ComponentGroupRef Id="SaveRegistry" />
+ </Feature>
+
+ <Directory Id="TARGETDIR" Name="SourceDir">
+ <Directory Id="CommonAppDataFolder">
+ <Directory Id="ProgramDataShib" Name="Shibboleth">
+ <Directory Id="IDPDISTDIR" Name="IdP"/>
+ </Directory>
+ </Directory>
+ <Directory Id="INSTALLDIR" Name="shibboleth-idp"/>
+ </Directory>
+
+ <Property Id="JAVA_EXECUTABLE" Secure="yes">
+ <DirectorySearch Id="JavaBinSearch" Depth="0" Path="[%JAVA_HOME]\bin">
+ <FileSearch Id="JavaBinSearch" Name="java.exe" />
+ </DirectorySearch>
+ </Property>
+
+ <Property Id="UCRTBASE_DLL" Secure="yes">
+ <DirectorySearch Id="UcrtBaseSearch" Depth="0" Path="[System64Folder]">
+ <FileSearch Id="UcrtSearch" Name="ucrtbase.dll" />
+ </DirectorySearch>
+ </Property>
+
+ <!-- Inherit the setup, if they were. -->
+ <CustomAction Id="SetDefaultInstallDir" Property="DefaultInstallDir" Value="[WindowsVolume]opt\shibboleth-idp\" />
+
+ <CustomAction Id="InheritInstallDir" Property="INSTALLDIR" Value="[OLD_INSTALLDIR]" />
+ <CustomAction Id="SetInstallDir" Property="INSTALLDIR" Value="[DefaultInstallDir]" />
+
+ <!-- Other properties -->
+ <CustomAction Id="SetDNSName" Property="DNSNAME" Value="[ComputerName]" />
+
+ <Binary Id="WriteConfigFilesSrc" SourceFile="scripts\shib_write_configs.vbs" />
+
+ <CustomAction Id="WriteConfigFiles" BinaryKey="WriteConfigFilesSrc" VBScriptCall="" Execute="deferred" Impersonate="no" />
+ <CustomAction Id="SetWriteConfigFiles" Property="WriteConfigFiles" Value="[INSTALLDIR];@;[DNSNAME];@;[IDP_SCOPE];@;[DEBUG_INSTALL];@;[CONFIGURE_AD];@;[AD_DOMAIN];@;[AD_USER];@;[AD_PASS];@;[AD_USE_GC]" />
+
+
+ <!-- Ant actions set the command line in two parts because of ICE03 -->
+ <CustomAction Id="SetIdpInstall1" Property="QtIdpInstall1" Value=""[JAVA_EXECUTABLE]" -cp "[IDPDISTDIR]bin\lib\*;[IDPDISTDIR]webapp\WEB-INF\lib\*" net.shibboleth.idp.installer.impl.IdPInstallerCLI"/>
+ <CustomAction Id="SetIdpInstall2" Property="QtIdpInstall2" Value="--propertyFile "[INSTALLDIR]idp.install.properties" --sourceDir [IDPDISTDIR]" />
+ <CustomAction Id="SetIdpInstall3" Property="QtIdpInstall" Value="[QtIdpInstall1] [QtIdpInstall2]" />
+ <CustomAction Id="RunIdpInstall" Directory="ProgramDataShib" ExeCommand="[QtIdpInstall]" Execute="deferred" Impersonate="no" />
+ <CustomAction Id="QtIdpInstall" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
+
+ <InstallUISequence>
+
+ <!-- inherit installationDir if there is something to inherit (Conditions set in ShibolethIdP-registry) -->
+ <Custom Action="SetDefaultInstallDir" After="AppSearch" />
+ <Custom Action="InheritInstallDir" After="AppSearch">OLD_INSTALLDIR AND NOT INSTALLDIR</Custom>
+ <Custom Action="SetInstallDir" After="SetDefaultInstallDir">NOT OLD_INSTALLDIR AND NOT INSTALLDIR</Custom>
+ <Custom Action="SetDNSName" After="AppSearch">NOT DNSNAME</Custom>
+
+ </InstallUISequence>
+
+ <InstallExecuteSequence>
+
+ <!-- Duplicate actions from the UI case - but only for auto 3->3 upgrades -->
+ <Custom Action="InheritInstallDir" After="AppSearch">OLD_INSTALLDIR AND NOT INSTALLDIR</Custom>
+
+ <!-- Work -->
+
+ <Custom Action="SetWriteConfigFiles" After="CostFinalize">NOT Installed</Custom>
+ <Custom Action="WriteConfigFiles" After="InstallFiles">NOT Installed</Custom>
+ <Custom Action="SetIdpInstall1" After="WriteConfigFiles">NOT Installed</Custom>
+ <Custom Action="SetIdpInstall2" After="SetIdpInstall1">NOT Installed</Custom>
+ <Custom Action="SetIdpInstall3" After="SetIdpInstall2">NOT Installed</Custom>
+ <Custom Action="RunIdpInstall" After="SetIdpInstall3">(NOT Installed) AND DEBUG_INSTALL</Custom>
+ <Custom Action="QtIdpInstall" After="SetIdpInstall3">(NOT Installed) AND (NOT DEBUG_INSTALL)</Custom>
+
+ </InstallExecuteSequence>
+
+ <Upgrade Id="$(var.UpgradeUUID)">
+ <UpgradeVersion ExcludeLanguages="yes" IncludeMaximum="yes" Maximum="127.255.255" Minimum="0.0.1" OnlyDetect="yes" Property="ALREADYINSTALLED" />
+ </Upgrade>
+
+ <UIRef Id="ShibbolethInstallDir" />
+ </Product>
+</Wix>
diff --git a/idp-msi/src/main/wix/ShibbolethIdP-registry.wxs b/idp-msi/src/main/wix/ShibbolethIdP-registry.wxs
new file mode 100644
index 000000000..52ab49ef5
--- /dev/null
+++ b/idp-msi/src/main/wix/ShibbolethIdP-registry.wxs
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an 'AS IS' BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied. See the License for the specific language governing
+ permissions and limitations under the License. -->
+
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+
+ <!-- to do with the IdP Registry -->
+
+ <?define ServiceName="shibd_idp"?>
+ <Fragment>
+ <ComponentGroup Id="SaveRegistry">
+ <Component Id="SaveTarget" Guid="{32A39FB0-21E4-475E-891A-C9901D3548A3}" Directory="INSTALLDIR" Win64="no">
+ <RegistryValue Id="targetReg" Root="HKLM" Key="SOFTWARE\Shibboleth\IdP" Name="InstallDir" Value="[INSTALLDIR]" Type="string" KeyPath="yes" />
+ </Component>
+ <!-- pretty icon for the "install programs" page -->
+ <Component Id="shib.ico" Guid="{7F4CE60B-A27B-4E07-8DD9-19F16B008C56}" Directory="INSTALLDIR" Win64="yes">
+ <File KeyPath="yes" Source="$(var.ProjectDir)\shib.ico" />
+ <RegistryValue Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductCode]" Name="DisplayIcon" Value="[#shib.ico],0" Type="string" />
+ </Component>
+ </ComponentGroup>
+
+ <Property Id="OLD_INSTALLDIR" Secure="yes">
+ <RegistrySearch Id="OldInstallDir" Root="HKLM" Key="SOFTWARE\Shibboleth\IdP" Name="InstallDir" Type="directory" Win64="no" />
+ </Property>
+
+ <Property Id="JAVA_JVMMX" Secure="yes">
+ <RegistrySearch Id="JvmMx" Root="HKLM" Key="SOFTWARE\Apache Software Foundation\Procrun 2.0\shibd_idp\Parameters\Java" Name="JvmMx" Type="raw" Win64="no" />
+ </Property>
+
+ <!-- Should be in Mergemodule -->
+ </Fragment>
+</Wix>
+
+
diff --git a/idp-msi/src/main/wix/ShibbolethIdP-update-dlg.wxs b/idp-msi/src/main/wix/ShibbolethIdP-update-dlg.wxs
new file mode 100644
index 000000000..f87dd28a8
--- /dev/null
+++ b/idp-msi/src/main/wix/ShibbolethIdP-update-dlg.wxs
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an 'AS IS' BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied. See the License for the specific language governing
+ permissions and limitations under the License. -->
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <!-- The dialog to display if we sense an upgrade -->
+ <Fragment>
+
+ <UI>
+ <Dialog Id="UpdateDlgShib" Width="370" Height="270" Title="[ProductName] Update">
+ <!-- Stuff at the top: picture, some text, a line -->
+ <Control Id="TopBitMap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" Text="WixUI_Bmp_Banner" />
+ <Control Id="TopInfo" Type="Text" X="15" Y="6" Width="150" Height="12" Text="{\WixUI_Font_Title}Update Shibboleth" Transparent="yes" />
+ <Control Id="TopDetailed" Type="Text" X="25" Y="24" Width="320" Height="12" Text="Update to [ProductName]" Transparent="yes" />
+ <Control Id="TopLine" Type="Line" X="0" Y="44" Width="370" Height="1" />
+
+ <!-- Where we are installing -->
+ <Control Id="DescriptionLine1" Type="Text" X="25" Y="51" Height="24" Width="320" Text="The updated files for [ProductName] will be installed to [INSTALLDIR]" />
+
+
+ <!-- Stuff at the bottom: line, Back,Next, [space] Cancel -->
+ <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="1" />
+ <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&Back">
+ <Publish Event="NewDialog" Value="WelcomeDlg">1</Publish>
+ </Control>
+
+ <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Text="&Next" Default="yes">
+ <Publish Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+ </Control>
+
+ <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Text="&Cancel" Cancel="yes">
+ <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+ </Control>
+ </Dialog>
+ </UI>
+ </Fragment>
+</Wix>
diff --git a/idp-msi/src/main/wix/ShibbolethIdP-warn-dlg.wxs b/idp-msi/src/main/wix/ShibbolethIdP-warn-dlg.wxs
new file mode 100644
index 000000000..444dc55be
--- /dev/null
+++ b/idp-msi/src/main/wix/ShibbolethIdP-warn-dlg.wxs
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an 'AS IS' BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied. See the License for the specific language governing
+ permissions and limitations under the License. -->
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <!-- The dialog to display if we sense a non default installation directory -->
+ <Fragment>
+
+ <UI>
+ <Dialog Id="WarnDlgShib" Width="370" Height="270" Title="[ProductName] Installation">
+ <!-- Stuff at the top: picture, some text, a line -->
+ <Control Id="TopBitMap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" Text="WixUI_Bmp_Banner" />
+ <Control Id="TopInfo" Type="Text" X="15" Y="6" Width="150" Height="12" Text="{\WixUI_Font_Title}Install Shibboleth" Transparent="yes" />
+ <Control Id="TopDetailed" Type="Text" X="25" Y="24" Width="320" Height="12" Text="Dont forget to set file permissions" Transparent="yes" />
+ <Control Id="TopLine" Type="Line" X="0" Y="44" Width="370" Height="1" />
+
+ <!-- Where we are installing -->
+ <Control Id="Warn" Type="Bitmap" X="25" Y="51" Height="32" Width="32" Text="WixUI_Ico_Exclam" />
+ <Control Id="Warn2" Type="Text" X="73" Y="51" Height="12" Width="270" Text="NOTE That unless you will be installing Jetty with the" />
+ <Control Id="Warn3" Type="Text" X="73" Y="64" Height="12" Width="270" Text="Shibboleth project installer you should set appropriate permissions." />
+ <Control Id="Warn4" Type="Text" X="73" Y="90" Height="12" Width="270" Text="See the Documentation for details." />
+ <Control Id="Warn5" Type="Text" X="73" Y="106" Height="12" Width="270" Text="The 'setacl' batch file provides an example." />
+
+ <!-- Stuff at the bottom: line, Back,Next, [space] Cancel -->
+ <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="1" />
+ <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&Back">
+ <Publish Event="NewDialog" Value="ConfigADDlg">CONFIGURE_AD</Publish>
+ <Publish Event="NewDialog" Value="InstallDirDlgShib">NOT CONFIGURE_AD</Publish>
+ </Control>
+
+ <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Text="&Next" Default="yes">
+ <Publish Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+ </Control>
+
+ <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Text="&Cancel" Cancel="yes">
+ <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+ </Control>
+ </Dialog>
+ </UI>
+ </Fragment>
+</Wix>
diff --git a/idp-msi/src/main/wix/TopBanner.bmp b/idp-msi/src/main/wix/TopBanner.bmp
new file mode 100644
index 000000000..b2082d906
Binary files /dev/null and b/idp-msi/src/main/wix/TopBanner.bmp differ
diff --git a/idp-msi/src/main/wix/license.rtf b/idp-msi/src/main/wix/license.rtf
new file mode 100644
index 000000000..d7480550b
--- /dev/null
+++ b/idp-msi/src/main/wix/license.rtf
@@ -0,0 +1,38 @@
+{\rtf1\ansi\ansicpg1252\deff0\deflang2057\deflangfe2057{\fonttbl{\f0\fswiss\fprq2\fcharset0 Helvetica;}{\f1\fmodern\fprq1\fcharset0 Courier New;}{\f2\fswiss\fprq2\fcharset0 Calibri;}}
+{\colortbl ;\red51\green51\blue51;\red0\green0\blue255;\red62\green79\blue144;\red255\green255\blue255;}
+{\*\generator Msftedit 5.41.21.2510;}\viewkind4\uc1\pard\cbpat4\sl276\slmult1\cf1\f0\fs20 Apache License\line\line Version 2.0, January 2004\line\line\pard\sl276\slmult1\cf0\b{\field{\*\fldinst{HYPERLINK "http://www.apache.org/licenses/"}}{\fldrslt{\ul\cf2 http://www.apache.org/licenses/}}}\cf1\b0\f0\fs20\par
+\pard\cbpat4\sl276\slmult1 TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\par
+\cf3\b 1. Definitions\cf1\b0 .\par
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.\par
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.\par
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.\par
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.\par
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.\par
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.\par
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).\par
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.\par
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or it [...]
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.\par
+\cf3\b 2. Grant of Copyright License\cf1\b0 . Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.\par
+\cf3\b 3. Grant of Patent License\cf1\b0 . Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alo [...]
+\cf3\b 4. Redistribution\cf1\b0 . You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:\par
+\pard\sl276\slmult1\tx720 1.\tab You must give any other recipients of the Work or Derivative Works a copy of this License; and\par
+\pard\sl276\slmult1 2.\tab You must cause any modified files to carry prominent notices stating that You changed the files; and\par
+3.\tab You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and\par
+4.\tab If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works [...]
+\pard\cbpat4\sl276\slmult1\cf3\b 5. Submission of Contributions\cf1\b0 . Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.\par
+\cf3\b 6. Trademarks\cf1\b0 . This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.\par
+\cf3\b 7. Disclaimer of Warranty\cf1\b0 . Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or red [...]
+\cf3\b 8. Limitation of Liability\cf1\b0 . In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (includin [...]
+\cf3\b 9. Accepting Warranty or Additional Liability\cf1\b0 . While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold eac [...]
+END OF TERMS AND CONDITIONS\par
+\kerning36\b\fs32 APPENDIX: How to apply the Apache License to your work\par
+\kerning0\b0\fs20 To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives.\par
+\pard\sl276\slmult1\tx916\tx1832\tx2748\tx3664\tx4580\tx5496\tx6412\tx7328\tx8244\tx9160\tx10076\tx10992\tx11908\tx12824\tx13740\tx14656\f1\fs23\par
+ Copyright [yyyy] [name of copyright owner]\par
+ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.\par
+ You may obtain a copy of the License at\par
+ {\field{\*\fldinst{HYPERLINK "http://www.apache.org/licenses/LICENSE-2.0"}}{\fldrslt{\ul\cf2 http://www.apache.org/licenses/LICENSE-2.0}}}\f1\fs23\par
+ Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.\cf0\f2\fs20\par
+}
+
\ No newline at end of file
diff --git a/idp-msi/src/main/wix/scripts/shib_write_configs.vbs b/idp-msi/src/main/wix/scripts/shib_write_configs.vbs
new file mode 100644
index 000000000..d68be08a7
--- /dev/null
+++ b/idp-msi/src/main/wix/scripts/shib_write_configs.vbs
@@ -0,0 +1,120 @@
+'
+' Code taken from the Shib SP install
+'
+Dim FileSystemObj, AntFile, PropsFile, JettyFile, JettyAntFile, LogFile
+Dim CustomData, msiProperties, InstallDir, IdPScope, DebugInstall, Domain
+Dim ConfigureAd, AdDomain, AdUser, AdPass, AdUseGC, LDAPFile, LDAPPort
+Dim LDAPSearchPath
+
+Set FileSystemObj = CreateObject("Scripting.FileSystemObject")
+
+' Eek
+on error resume next
+
+'Get the Parameters values via CustomActionData
+CustomData = Session.Property("CustomActionData")
+msiProperties = split(CustomData,";@;")
+InstallDir = msiProperties(0)
+
+'Remove all trailing backslashes to normalize
+do while (mid(InstallDir,Len(InstallDir),1) = "\")
+ InstallDir = mid(InstallDir,1,Len(InstallDir)-1)
+loop
+set LogFile=FileSystemObj.OpenTextFile(InstallDir & "\idp_installation.Log" , 2, True)
+
+InstallDirJava = Replace(InstallDir, "\", "/")
+InstallDirWindows = Replace(InstallDirJava, "/", "\\")
+
+IdPHostName = LCase(msiProperties(1))
+IdPScope = LCase(msiProperties(2))
+if IdPScope = "" then
+ Domain = IdPHostName
+else
+ Domain = IdPScope
+end if
+DebugInstall = LCase(msiProperties(3))
+ConfigureAd = LCase(msiProperties(4))
+if ConfigureAd = "true" then
+ AdDomain = LCase(msiProperties(5))
+ AdUser = LCase(msiProperties(6))
+ AdPass = msiProperties(7)
+ AdUseGC = LCase(msiProperties(8))
+end if
+
+LogFile.WriteLine "Installing to " & InstallDirJava
+LogFile.WriteLine "Host " & IdPHostName
+LogFile.WriteLine "Domain " & Domain
+LogFile.WriteLine "Scope " & IdPScope
+
+set AntFile=FileSystemObj.OpenTextFile(InstallDir & "\idp.install.properties" , 2, True)
+if (Err.Number = 0 ) then
+ AntFile.WriteLine "#"
+ AntFile.WriteLine "# File with properties the installer"
+ AntFile.WriteLine "#"
+ AntFile.WriteLine "idp.noprompt=yes"
+ AntFile.WriteLine "idp.host.name=" & IdpHostName
+ AntFile.WriteLine "idp.uri.subject.alt.name=https://" & Domain & "/idp"
+ AntFile.WriteLine "idp.target.dir=" & InstallDirJava
+ AntFile.WriteLine "idp.merge.properties=" & InstallDirJava & "/idp.install.replace.properties"
+ if (IdPScope <> "") then
+ AntFile.WriteLine "idp.scope=" & IdPScope
+ end if
+ if ConfigureAd = "true" then
+ AntFile.Writeline "idp.LDAP.credential=" & AdPass
+ AntFile.WriteLine "ldap.merge.properties=ldap.mergeProperties"
+ end if
+ AntFile.WriteLine "#"
+ AntFile.WriteLine "# Debug"
+ AntFile.WriteLine "#"
+ if (DebugInstall <> "") then
+ AntFile.WriteLine "idp.no.tidy=true"
+ else
+ AntFile.WriteLine "#idp.no.tidy=true"
+ end if
+ AntFile.Close
+end if
+
+set PropsFile=FileSystemObj.OpenTextFile(InstallDir & "\idp.install.replace.properties" , 2, True)
+if (Err.Number = 0 ) then
+ PropsFile.WriteLine "#"
+ PropsFile.WriteLine "# File to be merged into idp.properties"
+ PropsFile.WriteLine "#"
+ PropsFile.WriteLine "idp.entityID=https://" & Domain & "/idp"
+ if (IdPScope <> "") then
+ PropsFile.WriteLine "idp.scope=" & IdPScope
+ end if
+ PropsFile.Close
+else
+ LogFile.Writeline "PropsFile failed " & Err & " - " & PropsFile
+end if
+
+
+if ConfigureAd = "true" then
+
+ if AdUseGc= "true" then
+ LDAPPort="3268"
+ LDAPSearchPath="DC=" &Replace(AdDomain, ".", ", DC=")
+ else
+ LDAPPort="389"
+ LDAPSearchPath="CN=Users, DC=" &Replace(AdDomain, ".", ", DC=")
+ end if
+
+ set LDAPFile=FileSystemObj.OpenTextFile(InstallDir & "\ldap.mergeProperties" , 2, True)
+ if (Err.Number = 0 ) then
+ LDAPFile.Writeline "idp.authn.LDAP.authenticator= adAuthenticator"
+ LDAPFile.Writeline "idp.authn.LDAP.ldapURL=ldap://" & AdDomain & ":" & LDAPPort
+ LDAPFile.Writeline "idp.authn.LDAP.baseDN=" & LDAPSearchPath
+ LDAPFile.Writeline "idp.authn.LDAP.userFilter= (sAMAccountName={user})"
+ LDAPFile.Writeline "idp.authn.LDAP.bindDN=" & AdUser
+ LDAPFile.Writeline "idp.attribute.resolver.LDAP.searchFilter= (sAMAccountName=$resolutionContext.principal)"
+ LDAPFile.Writeline "idp.authn.LDAP.dnFormat= %s@" & AdDomain
+ LDAPFile.Close
+ else
+ LogFile.Writeline "AD Properties failed " & Err
+ end if
+else
+ LogFile.WriteLine "NoAd " & ConfigureAd
+end if
+
+
+LogFile.Close
\ No newline at end of file
diff --git a/idp-msi/src/main/wix/shib.ico b/idp-msi/src/main/wix/shib.ico
new file mode 100644
index 000000000..e60a6dfd2
Binary files /dev/null and b/idp-msi/src/main/wix/shib.ico differ
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list