[java-identity-provider] 07/07: IDP-2136 Consider Splitting the Windows Installer into IdP and Jetty+Procrun
Rod Widdowson
rdw at steadingsoftware.com
Sat Jul 29 14:30:16 UTC 2023
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch main
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=2d3336a0e8568f270ab57abe2ac653a07d086be1
commit 2d3336a0e8568f270ab57abe2ac653a07d086be1
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Jul 29 15:27:33 2023 +0100
IDP-2136 Consider Splitting the Windows Installer into IdP and Jetty+Procrun
https://shibboleth.atlassian.net/browse/IDP-2136
Remove all Jetty stuff from the IdP MSI build.
This includes the dialogs.
---
idp-installer/src/main/wix/IdP.bat | 78 +---------
.../src/main/wix/ShibbolethIdP-delete.wxs | 27 ++--
.../src/main/wix/ShibbolethIdP-install-dlg.wxs | 66 ++------
idp-installer/src/main/wix/ShibbolethIdP-main.wxs | 167 ++-------------------
.../src/main/wix/ShibbolethIdP-update-dlg.wxs | 41 -----
.../src/main/wix/scripts/shib_write_configs.vbs | 16 +-
6 files changed, 44 insertions(+), 351 deletions(-)
diff --git a/idp-installer/src/main/wix/IdP.bat b/idp-installer/src/main/wix/IdP.bat
index 59124265c..61b453201 100644
--- a/idp-installer/src/main/wix/IdP.bat
+++ b/idp-installer/src/main/wix/IdP.bat
@@ -4,8 +4,8 @@ setlocal
REM Preconditions
-if "%2%" == "" (
- Echo Idp PATH_TO_IDP_DISTRIBUTION PATH_TO_JETTY_BASE_DISTRO
+if "%1%" == "" (
+ Echo Idp PATH_TO_IDP_DISTRIBUTION
goto done
)
@@ -14,11 +14,6 @@ if not defined WIX (
goto done
)
-if not exist jetty-x64.msm (
- echo RUN JETTY.BAT FIRST
- goto done
-)
-
REM Clear up detritus from last time
if exist idp_contents.wxs (
@@ -29,10 +24,6 @@ if exist idp-extract (
rd /q /s idp-extract
)
-if exist idp-jetty-base-extract (
- rd /q /s idp-jetty-base-extract
-)
-
REM Set up environment
if not defined JAVA_JDK (
@@ -74,11 +65,7 @@ if ERRORLEVEL 1 (
:noIdPSig
mkdir idp-extract
cd idp-extract
-if exist "%1" (
- "%JARCMD%" xf %1
-) else (
- "%JARCMD%" xf ..\%1
-)
+"%JARCMD%" xf %1
rem is this a real package?
dir /s install.bat 1> nl:a 2> nl:b
@@ -87,48 +74,8 @@ if ERRORLEVEL 1 (
echo Could not find install.bat in IdP package
goto done;
)
-cd ..
-
-REM Now do the same again for jetty-base
-if not exist %2% (
- echo Error: Could not locate jetty base zip %2%
- goto done
-)
-
-if not exist %2.asc (
- echo Error: Could not locate signature for jetty base zip %2%.asc
- goto noJettyBaseSig
-)
-
-gpg --verify %2.asc %2
-if ERRORLEVEL 1 (
- echo Error: Signature check failed on %2%
- goto done
-)
-:noJettyBaseSig
-mkdir idp-jetty-base-extract
-cd idp-jetty-base-extract
-if exist "%2" (
- "%JARCMD%" xf %2
-) else (
- "%JARCMD%" xf ..\%2
-)
-rem is this a real package?
-dir /s idp.ini.windows 1> nl:a 2> nl:b
-if ERRORLEVEL 1 (
- cd ..
- echo Could not find idp.ini.windows in Jetty Base package
- goto done;
-)
-for /D %%X in (*) do set jettyBaseEx=%%X
-rename %jettyBaseEx% jetty-base
-
-cd ..\idp-extract
for /D %%X in (*) do set idpex=%%X
-rem for now copy in the ant file for jetty
-copy ..\scripts\any-jetty.xml %idpEx%\bin\
-
rem The file name gets too big....
rename %idpex% IdPEx
set idpex=IdPEx
@@ -138,22 +85,7 @@ if exist %idpex%\embedded (
rd /q /s %idpex%\embedded
)
-cd ..\idp-jetty-base-extract\jetty-base
-rename start.d start.d.dist
-if ERRORLEVEL 1 (
- cd ..
- echo jetty-base/start.d directory not found?
- goto done;
-)
-rem IDP-1149 make doubley sure that we have a jetty-base\tmp dir
-mkdir tmp
-echo "keeper" > tmp\.keep
-
-cd ..\..
-"%WIX%/BIN/HEAT" dir idp-jetty-base-extract\jetty-base -platform -gg -dr INSTALLDIR -var var.jettyBaseRoot -cg JettyBaseGroup -out jetty_base_contents.wxs -src
-if ERRORLEVEL 1 goto done
-"%WIX%/BIN/CANDLE" -nologo -arch x86 -djettyBaseRoot=idp-jetty-base-extract\jetty-base jetty_base_contents.wxs
-if ERRORLEVEL 1 goto done
+cd ..
"%WIX%/BIN/HEAT" dir idp-extract\%idpex% -platform -gg -dr IDPDISTDIR -var var.idpSrc -cg IdPGroup -out idp_contents.wxs -srd
if ERRORLEVEL 1 goto done
@@ -168,7 +100,7 @@ if ERRORLEVEL 1 goto done
"%WIX%/BIN/CANDLE" -nologo -arch x64 -dProjectDir=. ShibbolethIdP-main.wxs ShibbolethIdP-registry.wxs ShibbolethIdP-delete.wxs -ext WixUtilExtension
if ERRORLEVEL 1 goto done
-"%WIX%/BIN/LIGHT" -nologo -out idp-x64.msi -ext WixUIExtension ShibbolethIdP-main.wixobj idp_contents.wixobj ShibbolethIdP-registry.wixobj jetty_base_contents.wixobj ShibbolethIdP-gui.wixobj ShibbolethIdP-install-dlg.wixobj ShibbolethIdP-adconfig-dlg.wixobj ShibbolethIdP-update-dlg.wixobj ShibbolethIdP-warndir-dlg.wixobj ShibbolethIdP-delete.wixobj -ext WixUtilExtension -sice:ICE61
+"%WIX%/BIN/LIGHT" -nologo -out idp-x64.msi -ext WixUIExtension ShibbolethIdP-main.wixobj idp_contents.wixobj ShibbolethIdP-registry.wixobj ShibbolethIdP-gui.wixobj ShibbolethIdP-install-dlg.wixobj ShibbolethIdP-adconfig-dlg.wixobj ShibbolethIdP-update-dlg.wixobj ShibbolethIdP-warndir-dlg.wixobj ShibbolethIdP-delete.wixobj -ext WixUtilExtension -sice:ICE61
if ERRORLEVEL 1 goto done
diff --git a/idp-installer/src/main/wix/ShibbolethIdP-delete.wxs b/idp-installer/src/main/wix/ShibbolethIdP-delete.wxs
index c798ac81a..884ab232b 100644
--- a/idp-installer/src/main/wix/ShibbolethIdP-delete.wxs
+++ b/idp-installer/src/main/wix/ShibbolethIdP-delete.wxs
@@ -18,30 +18,21 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
<!-- Explicit delete behind ourselves on installs -->
<Fragment>
- <ComponentGroup Id="DeleteFiles">
- <Component Id="RemoveOldWebApp" 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" />
- </Component>
- <Component Id="RemoveOldSystem" Guid="{F66C4612-715A-499F-ABC0-73B399AE02ED}" Win64="no" Directory="INSTALLDIR">
- <RegistryValue Id="RemoveOldSystem" Root="HKLM" Key="SOFTWARE\Shibboleth\IdP" Name="RemoveOldSystem" Value="TRUE" Type="string" KeyPath="yes" />
- <util:RemoveFolderEx On="install" Property="OldSystem" />
- </Component>
+ <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>
- <Component Id="RemoveOldBinLib" Guid="{209E678E-C54F-49DC-9FCE-CD368991FD45}" Win64="no" Directory="INSTALLDIR">
- <RegistryValue Id="RemoveBinLib" Root="HKLM" Key="SOFTWARE\Shibboleth\IdP" Name="RemoveBinLib" Value="TRUE" Type="string" KeyPath="yes" />
- <util:RemoveFolderEx On="install" Property="OldBinLib" />
- </Component>
-
- </ComponentGroup>
<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="InheritInstallJetty" />
- <Custom Action="SetOldWebApp" After="InheritInstallJetty" />
- <Custom Action="SetOldBinLib" After="InheritInstallJetty" />
+ <Custom Action="SetOldSystem" After="WixRemoveFoldersEx" />
+ <Custom Action="SetOldWebApp" After="WixRemoveFoldersEx" />
+ <Custom Action="SetOldBinLib" After="WixRemoveFoldersEx" />
</InstallExecuteSequence>
</Fragment>
diff --git a/idp-installer/src/main/wix/ShibbolethIdP-install-dlg.wxs b/idp-installer/src/main/wix/ShibbolethIdP-install-dlg.wxs
index 3c5ab8f9e..ce31468dc 100644
--- a/idp-installer/src/main/wix/ShibbolethIdP-install-dlg.wxs
+++ b/idp-installer/src/main/wix/ShibbolethIdP-install-dlg.wxs
@@ -27,7 +27,6 @@
<!-- This Dialog sets up:
- INSTALLDIR
- - INSTALL_JETTY (and as a result turns the jetty feature on or off)
- CONFIGURE_AD (and as a result selects the AD page or not)
-->
@@ -48,51 +47,14 @@
<Publish Event="[_BrowseProperty]" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
</Control>
- <!-- Jetty? -->
- <Control Id="InstallJetty" Type="CheckBox" X="25" Y="92" Height="20" Width="60" Property="INSTALL_JETTY" CheckBoxValue="TRUE" Text="Install &Jetty"/>
- <Control Id="InstallJettyD" Type="CheckBox" X="105" Y="92" Height="20" Width="60"
- Property="INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7" CheckBoxValue="TRUE" Text="Run As &User">
- <Condition Action="hide">NOT INSTALL_JETTY</Condition>
- <Condition Action="show">INSTALL_JETTY</Condition>
- </Control>
<!-- AD? -->
- <Control Id="ConfigureAD" Type="CheckBox" X="200" Y="92" Height="20" Width="150" Property="CONFIGURE_AD" CheckBoxValue="TRUE" Text="Configure for &Active Directory" />
+ <Control Id="ConfigureAD" Type="CheckBox" X="25" Y="92" Height="20" Width="150" Property="CONFIGURE_AD" CheckBoxValue="TRUE" Text="Configure for &Active Directory" />
- <!-- SHIBD_USER -->
- <Control Id="DescriptionLine3A" Type="Text" X="25" Y="115" Height="20" Width="60" Text="User Domain">
- <Condition Action="hide">NOT INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 OR NOT INSTALL_JETTY</Condition>
- <Condition Action="show">INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 AND INSTALL_JETTY</Condition>
- </Control>
- <Control Id="Shibd_Domain" Type="Edit" X="85" Y="111" Height="17" Width="80"
- Property="JETTYD_DOMAIN.684B3207_0D64_43E6_9E6A_3ACB8B7672D7" Text="[JETTYD_DOMAIN.684B3207_0D64_43E6_9E6A_3ACB8B7672D7]">
- <Condition Action="hide">NOT INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 OR NOT INSTALL_JETTY</Condition>
- <Condition Action="show">INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 AND INSTALL_JETTY</Condition>
- </Control>
+ <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="DescriptionLine3B" Type="Text" X="25" Y="135" Height="20" Width="60" Text="Username">
- <Condition Action="hide">NOT INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 OR NOT INSTALL_JETTY</Condition>
- <Condition Action="show">INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 AND INSTALL_JETTY</Condition>
- </Control>
- <Control Id="Shibd_User" Type="Edit" X="85" Y="133" Height="17" Width="80"
- Property="JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7" Text="[JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7]">
- <Condition Action="hide">NOT INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 OR NOT INSTALL_JETTY</Condition>
- <Condition Action="show">INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 AND INSTALL_JETTY</Condition>
- </Control>
- <Control Id="DescriptionLine3C" Type="Text" X="180" Y="135" Height="20" Width="60" Text="Password">
- <Condition Action="hide">NOT INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 OR NOT INSTALL_JETTY</Condition>
- <Condition Action="show">INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 AND INSTALL_JETTY</Condition>
- </Control>
- <Control Id="Shibd_Pass" Type="Edit" X="250" Y="133" Height="17" Width="80"
- Property="JETTYD_PASSWORD.684B3207_0D64_43E6_9E6A_3ACB8B7672D7" Password="yes">
- <Condition Action="hide">NOT INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 OR NOT INSTALL_JETTY</Condition>
- <Condition Action="show">INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 AND INSTALL_JETTY</Condition>
- </Control>
-
- <Control Id="DescriptionLine4" Type="Text" X="25" Y="158" 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="160" Height="17" Width="150" Property="DNSNAME" Text="[DNSNAME]" />
-
- <Control Id="DescriptionLine5" Type="Text" X="25" Y="198" 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="200" Height="17" Width="150" Property="IDP_SCOPE" Text="[IDP_SCOPE]" />
+ <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" />
@@ -101,21 +63,15 @@
</Control>
<Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Text="&Next" Default="yes">
- <Publish Event="AddLocal" Value="InstallJetty">INSTALL_JETTY</Publish>
- <Publish Event="Remove" Value="InstallJetty">Not INSTALL_JETTY</Publish>
<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="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="VerifyReadyDlg">
- (WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1") AND CONFIGURE_AD <>"TRUE" AND (INSTALL_JETTY OR (INSTALLDIR=DefaultInstallDir))
- </Publish>
+ (WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1") AND CONFIGURE_AD <>"TRUE" AND (INSTALLDIR=DefaultInstallDir)
+ </Publish>
<Publish Event="NewDialog" Value="WarnDirDlgShib">
- (WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1") AND CONFIGURE_AD <>"TRUE" AND NOT (INSTALL_JETTY OR (INSTALLDIR=DefaultInstallDir))
- </Publish>
+ (WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1") AND CONFIGURE_AD <>"TRUE" AND NOT (INSTALLDIR=DefaultInstallDir)
+ </Publish>
<Publish Event="NewDialog" Value="ConfigADDlg">
(WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1") AND CONFIGURE_AD="TRUE"
</Publish>
diff --git a/idp-installer/src/main/wix/ShibbolethIdP-main.wxs b/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
index 1cdcc5dcc..435223688 100644
--- a/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
+++ b/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
@@ -25,6 +25,7 @@
<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 -->
@@ -35,16 +36,9 @@
<Property Id="ARPNOMODIFY" Value="TRUE" />
<Feature Id="ProductFeature" Title="IdP" Level="1">
- <Feature Id="InstallJetty" Title="Jetty">
- <MergeRef Id="jetty" />
- <ComponentRef Id="JettyPermissions" />
- <ComponentRef Id="Shibd_idpw" />
- <ComponentGroupRef Id="JettyBaseGroup" />
- </Feature>
- <ComponentGroupRef Id="DeleteFiles" />
+ <ComponentRef Id="DeleteFiles" />
<ComponentGroupRef Id="IdPGroup" />
<ComponentGroupRef Id="SaveRegistry" />
- <ComponentRef Id="IdPPermissions" />
</Feature>
<Directory Id="TARGETDIR" Name="SourceDir">
@@ -53,70 +47,7 @@
<Directory Id="IDPDISTDIR" Name="IdP"/>
</Directory>
</Directory>
- <Directory Id="ProgramFilesFolder">
- <Directory Id="SHIBBOLETHDIR" Name="Shibboleth">
- <Merge Id="jetty" Language="1033" SourceFile="$(var.ProjectDir)\jetty-x64.msm" DiskId="1" />
- <Directory Id="INSTALLDIR" Name="IdP">
- <Directory Id="CredsFolder" Name="credentials" />
- <Directory Id="ConfFolder" Name="conf" />
- <Directory Id="LogsFolder" Name="logs" />
- <Directory Id="JettyBaseFolder" Name="jetty-base">
- <Directory Id="StartDotD" Name="start.d" />
- <Directory Id="JettyLogs" Name="logs" />
- <Directory Id="JettyTmp" Name="tmp" />
- </Directory>
- <Directory Id="BinFolder" Name="bin">
- <Component Id="Shibd_idpw" Guid="{30E1130E-BEBF-4167-83A0-BBDE083968C4}" Win64="no">
- <RegistryValue Id="Shibd_idpw_r" Root="HKLM" Key="SOFTWARE\Shibboleth\IdP" Name="Shibd_idpw" Value="TRUE" Type="string" KeyPath="yes" />
- <Shortcut Id="Shibd_idpw_shortcut" Name="shibd_idpw.exe" Target="[ProgramFilesFolder]\Shibboleth\Procrun\shibd_idpw.exe" />
- </Component>
- </Directory>
- <Component Id="IdPPermissions" Guid="{5672474B-3CD2-44EB-9942-871844A2B089}" Win64="no">
-a <RegistryValue Id="SetPermissions" Root="HKLM" Key="SOFTWARE\Shibboleth\IdP" Name="SetPermissions" Value="TRUE" Type="string" KeyPath="yes" />
- <CreateFolder Directory="CredsFolder">
- <Permission User="Administrators" GenericAll="yes" />
- <Permission User="SYSTEM" GenericAll="yes" />
- <Permission Domain="[JETTYD_DOMAIN.684B3207_0D64_43E6_9E6A_3ACB8B7672D7]" User="[PERMISSION_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7]"
- ReadPermission="yes" GenericRead="yes" GenericExecute="yes" Read="yes" />
- </CreateFolder>
- <CreateFolder Directory="ConfFolder">
- <Permission User="Administrators" GenericAll="yes" />
- <Permission User="SYSTEM" GenericAll="yes" />
- <Permission Domain="[JETTYD_DOMAIN.684B3207_0D64_43E6_9E6A_3ACB8B7672D7]" User="[PERMISSION_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7]"
- ReadPermission="yes" Read="yes" GenericRead="yes" GenericExecute="yes" />
- </CreateFolder>
- <CreateFolder Directory="LogsFolder">
- <Permission User="Administrators" GenericAll="yes" />
- <Permission User="SYSTEM" GenericAll="yes" />
- <Permission Domain="[JETTYD_DOMAIN.684B3207_0D64_43E6_9E6A_3ACB8B7672D7]" User="[PERMISSION_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7]"
- GenericAll="yes"/>
- </CreateFolder>
-
- </Component>
- <Component Id="JettyPermissions" Guid="{900980C5-CF3D-4816-9922-6142C12F6D13}" Win64="no">
- <RegistryValue Id="SetPermissionsJetty" Root="HKLM" Key="SOFTWARE\Shibboleth\IdP" Name="SetPermissionsJetty" Value="TRUE" Type="string" KeyPath="yes" />
- <CreateFolder Directory="StartDotD">
- <Permission User="Administrators" GenericAll="yes" />
- <Permission User="SYSTEM" GenericAll="yes" />
- <Permission Domain="[JETTYD_DOMAIN.684B3207_0D64_43E6_9E6A_3ACB8B7672D7]" User="[PERMISSION_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7]"
- ReadPermission="yes" GenericRead="yes" Read="yes" GenericExecute="yes" />
- </CreateFolder>
- <CreateFolder Directory="JettyLogs">
- <Permission User="Administrators" GenericAll="yes" />
- <Permission User="SYSTEM" GenericAll="yes" />
- <Permission Domain="[JETTYD_DOMAIN.684B3207_0D64_43E6_9E6A_3ACB8B7672D7]" User="[PERMISSION_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7]"
- GenericAll="yes"/>
- </CreateFolder>
- <CreateFolder Directory="JettyTmp">
- <Permission User="Administrators" GenericAll="yes" />
- <Permission User="SYSTEM" GenericAll="yes" />
- <Permission Domain="[JETTYD_DOMAIN.684B3207_0D64_43E6_9E6A_3ACB8B7672D7]" User="[PERMISSION_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7]"
- GenericAll="yes"/>
- </CreateFolder>
- </Component>
- </Directory>
- </Directory>
- </Directory>
+ <Directory Id="INSTALLDIR" Name="shibboleth-idp"/>
</Directory>
<Property Id="JAVA_EXECUTABLE" Secure="yes">
@@ -127,21 +58,15 @@ a <RegistryValue Id="SetPermissions" Root="HKLM" Key=
<Property Id="UCRTBASE_DLL" Secure="yes">
<DirectorySearch Id="UcrtBaseSearch" Depth="0" Path="[System64Folder]">
- <FileSearch Id="UcrtnSearch" Name="ucrtbase.dll" />
+ <FileSearch Id="UcrtSearch" Name="ucrtbase.dll" />
</DirectorySearch>
</Property>
- <Property Id="ALWAYS_START_SERVICE" Value="TRUE" Secure="yes" />
- <CustomAction Id="PassdownStartService" Property="ALWAYS_START_SERVICE.684B3207_0D64_43E6_9E6A_3ACB8B7672D7" Value="[ALWAYS_START_SERVICE]" />
-
- <CustomAction Id="NoJavaBin" Error="Could not locate Java.exe. Please check the value for JAVA_HOME." />
-
<!-- Inherit the setup, if they were. -->
- <CustomAction Id="InheritInstallDir" Property="INSTALLDIR" Value="[OLD_INSTALLDIR]" />
- <CustomAction Id="InheritInstallJetty" Property="INSTALL_JETTY" Value="[OLD_INSTALL_JETTY]" />
+ <CustomAction Id="SetDefaultInstallDir" Property="DefaultInstallDir" Value="[WindowsVolume]opt\shibboleth-idp\" />
- <!-- Pass the NO_FIREWALL_EXCEPTION parameter down to the Jetty Merge Module -->
- <CustomAction Id="PassdownNoFireWall" Property="NO_FIREWALL.684B3207_0D64_43E6_9E6A_3ACB8B7672D7" Value="[NO_FIREWALL_EXCEPTION]" />
+ <CustomAction Id="InheritInstallDir" Property="INSTALLDIR" Value="[OLD_INSTALLDIR]" />
+ <CustomAction Id="SetInstallDir" Property="INSTALLDIR" Value="[DefaultInstallDir]" />
<!-- Other properties -->
<CustomAction Id="SetDNSName" Property="DNSNAME" Value="[ComputerName]" />
@@ -149,56 +74,22 @@ a <RegistryValue Id="SetPermissions" Root="HKLM" Key=
<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];@;[INSTALL_JETTY];@;[IDP_SCOPE];@;[DEBUG_INSTALL];@;[CONFIGURE_AD];@;[AD_DOMAIN];@;[AD_USER];@;[AD_PASS];@;[AD_USE_GC]" />
+ <CustomAction Id="SetWriteConfigFiles" Property="WriteConfigFiles" Value="[INSTALLDIR];@;[DNSNAME];@;[IDP_SCOPE];@;[DEBUG_INSTALL];@;[CONFIGURE_AD];@;[AD_DOMAIN];@;[AD_USER];@;[AD_PASS];@;[AD_USE_GC]" />
- <CustomAction Id="SetDefaultInstallDir" Property="DefaultInstallDir" Value="[WindowsVolume]opt\shibboleth-idp\" />
<!-- 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="ProgramFilesFolder" ExeCommand="[QtIdpInstall]" Execute="deferred" Impersonate="no" />
+ <CustomAction Id="RunIdpInstall" Directory="ProgramDataShib" ExeCommand="[QtIdpInstall]" Execute="deferred" Impersonate="no" />
<CustomAction Id="QtIdpInstall" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
- <CustomAction Id="SetFinalizeJetty" Property="QtFinalizeJetty" Value=""[JAVA_EXECUTABLE]" -cp "[IDPDISTDIR]\bin\lib\*;[IDPDISTDIR]\webapp\WEB-INF\lib\*" -Didp.home="[JAVA_IDP_HOME]" net.shibboleth.idp.installer.impl.FinalizeJettyBase" />
- <CustomAction Id="RunFinalizeJetty" Directory="INSTALLDIR" ExeCommand="[QtFinalizeJetty]" Execute="deferred" Impersonate="no" />
- <CustomAction Id="QtFinalizeJetty" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
-
-
- <!-- Actions to add an appropriate ACE to existing file when we are running as a user -->
- <CustomAction Id="SetACEUser" Property="ACE_USER" Value="[JETTYD_DOMAIN.684B3207_0D64_43E6_9E6A_3ACB8B7672D7]\[JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7]" />
- <CustomAction Id="SetACEConf" Property="QtSetACEConf" Value=""c:\Windows\System32\cacls.exe" "[INSTALLDIR]\conf" /e /t /g [ACE_USER]:r" />
- <CustomAction Id="SetACECreds" Property="QtSetACECreds" Value=""c:\Windows\System32\cacls.exe" "[INSTALLDIR]\credentials" /e /t /g [ACE_USER]:r" />
- <CustomAction Id="SetACELogs" Property="QtSetACELogs" Value=""c:\Windows\System32\cacls.exe" "[INSTALLDIR]\logs" /e /t /g [ACE_USER]:f" />
-
- <CustomAction Id="QtSetACEConf" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
- <CustomAction Id="QtSetACECreds" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
- <CustomAction Id="QtSetACELogs" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
-
- <CustomAction Id="SetACEJettyStart" Property="QtSetACEJettyStart" Value=""c:\Windows\System32\cacls.exe" "[INSTALLDIR]\jetty-base\start.d" /e /t /g [ACE_USER]:r" />
- <CustomAction Id="SetACEJettyLogs" Property="QtSetACEJettyLogs" Value=""c:\Windows\System32\cacls.exe" "[INSTALLDIR]\jetty-base\logs" /e /t /g [ACE_USER]:f" />
- <CustomAction Id="SetACEJettyTmp" Property="QtSetACEJettyTmp" Value=""c:\Windows\System32\cacls.exe" "[INSTALLDIR]\jetty-base\tmp" /e /t /g [ACE_USER]:f" />
-
- <CustomAction Id="QtSetACEJettyStart" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
- <CustomAction Id="QtSetACEJettyLogs" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
- <CustomAction Id="QtSetACEJettyTmp" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
-
- <CustomAction Id="SetACEProcrunLog" Property="QtSetACEProcrunLog" Value=""c:\Windows\System32\cacls.exe" "[SHIBBOLETHDIR]ProcRun\log" /e /t /g [ACE_USER]:f" />
- <CustomAction Id="QtSetACEProcrunLog" 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</Custom>
-
-
- <!-- inherit JETTY_INSTALL if there is something to inherit AND JETTY_INSTALL was not passed in -->
- <Custom Action="InheritInstallJetty" After="AppSearch">OLD_INSTALL_JETTY AND NOT INSTALL_JETTY</Custom>
-
- <!-- Could we find JAVA.EXE ?-->
- <Custom Action="NoJavaBin" After="AppSearch">NOT JAVA_EXECUTABLE and NOT Installed</Custom>
-
+ <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>
@@ -206,38 +97,7 @@ a <RegistryValue Id="SetPermissions" Root="HKLM" Key=
<InstallExecuteSequence>
<!-- Duplicate actions from the UI case - but only for auto 3->3 upgrades -->
- <Custom Action="InheritInstallDir" After="AppSearch">OLD_INSTALLDIR</Custom>
-
- <Custom Action="InheritInstallJetty" After="AppSearch">OLD_JETTY_INSTALL AND NOT JETTY_INSTALL</Custom>
-
- <!-- Pass across the instructions to Jetty-->
- <Custom Action="PassdownNoFireWall" After="AppSearch">NO_FIREWALL_EXCEPTION</Custom>
- <Custom Action="PassdownStartService" After="AppSearch"/>
-
- <!-- Do the ACE setting just after the directories -->
- <Custom Action="SetACEUser" After="CreateFolders">INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7</Custom>
-
- <Custom Action="SetACEConf" After="SetACEUser">INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7</Custom>
- <Custom Action="SetACECreds" After="SetACEUser">INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7</Custom>
- <Custom Action="SetACELogs" After="SetACEUser">INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7</Custom>
-
- <Custom Action="QtSetACEConf" After="SetACEConf">INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7</Custom>
- <Custom Action="QtSetACECreds" After="SetACECreds">INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7</Custom>
- <Custom Action="QtSetACELogs" After="SetACELogs">INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7</Custom>
-
- <Custom Action="SetACEJettyStart" After="SetACEUser">INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7</Custom>
- <Custom Action="SetACEJettyLogs" After="SetACEUser">INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7</Custom>
- <Custom Action="SetACEJettyTmp" After="SetACEUser">INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7</Custom>
-
- <Custom Action="QtSetACEJettyStart" After="SetACEJettyStart">INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7</Custom>
- <Custom Action="QtSetACEJettyLogs" After="SetACEJettyLogs">INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7</Custom>
- <Custom Action="QtSetACEJettyTmp" After="SetACEJettyTmp">INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7</Custom>
-
- <Custom Action="SetACEProcrunLog" After="SetACEUser">INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7</Custom>
- <Custom Action="QtSetACEProcrunLog" After="SetACEProcrunLog">INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7</Custom>
-
- <!-- Could we find JAVA.EXE ?-->
- <Custom Action="NoJavaBin" After="AppSearch">NOT JAVA_EXECUTABLE</Custom>
+ <Custom Action="InheritInstallDir" After="AppSearch">OLD_INSTALLDIR AND NOT INSTALLDIR</Custom>
<!-- Work -->
@@ -248,9 +108,6 @@ a <RegistryValue Id="SetPermissions" Root="HKLM" Key=
<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>
- <Custom Action="SetFinalizeJetty" After="RunIdpInstall">(NOT Installed) AND INSTALL_JETTY</Custom>
- <Custom Action="RunFinalizeJetty" After="SetFinalizeJetty">(NOT Installed) AND INSTALL_JETTY AND DEBUG_INSTALL</Custom>
- <Custom Action="QtFinalizeJetty" After="SetFinalizeJetty">(NOT Installed) AND INSTALL_JETTY AND (NOT DEBUG_INSTALL)</Custom>
</InstallExecuteSequence>
diff --git a/idp-installer/src/main/wix/ShibbolethIdP-update-dlg.wxs b/idp-installer/src/main/wix/ShibbolethIdP-update-dlg.wxs
index 4667bd72a..2e0a201e5 100644
--- a/idp-installer/src/main/wix/ShibbolethIdP-update-dlg.wxs
+++ b/idp-installer/src/main/wix/ShibbolethIdP-update-dlg.wxs
@@ -31,45 +31,6 @@
<!-- 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]" />
- <!-- Jetty? -->
- <Control Id="UpdateJetty" Type="CheckBox" X="25" Y="80" Height="17" Width="60" CheckBoxPropertyRef="INSTALL_JETTY" CheckBoxValue="TRUE" Text="Install Jetty"/>
-
- <Control Id="UpdateDaemon" Type="CheckBox" X="105" Y="80" Height="20" Width="60"
- CheckBoxPropertyRef="INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7" CheckBoxValue="TRUE" Text="Run As &User">
- <Condition Action="hide">NOT INSTALL_JETTY</Condition>
- <Condition Action="show">INSTALL_JETTY</Condition>
- </Control>
-
- <!-- SHIBD_USER -->
- <Control Id="UpdateDescriptionLine3A" Type="Text" X="25" Y="103" Height="20" Width="60" Text="User Domain">
- <Condition Action="hide">NOT INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 OR NOT INSTALL_JETTY</Condition>
- <Condition Action="show">INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 AND INSTALL_JETTY</Condition>
- </Control>
- <Control Id="UpdateShibd_Domain" Type="Edit" X="85" Y="99" Height="17" Width="80"
- Property="JETTYD_DOMAIN.684B3207_0D64_43E6_9E6A_3ACB8B7672D7" Text="[JETTYD_DOMAIN.684B3207_0D64_43E6_9E6A_3ACB8B7672D7]">
- <Condition Action="hide">NOT INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 OR NOT INSTALL_JETTY</Condition>
- <Condition Action="show">INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 AND INSTALL_JETTY</Condition>
- </Control>
-
- <Control Id="UpdateDescriptionLine3B" Type="Text" X="25" Y="123" Height="20" Width="60" Text="Username">
- <Condition Action="hide">NOT INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 OR NOT INSTALL_JETTY</Condition>
- <Condition Action="show">INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 AND INSTALL_JETTY</Condition>
- </Control>
- <Control Id="UpdateShibd_User" Type="Edit" X="85" Y="121" Height="17" Width="80"
- Property="JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7" Text="[JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7]">
- <Condition Action="hide">NOT INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 OR NOT INSTALL_JETTY</Condition>
- <Condition Action="show">INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 AND INSTALL_JETTY</Condition>
- </Control>
- <Control Id="UpdateDescriptionLine3C" Type="Text" X="180" Y="123" Height="20" Width="60" Text="Password">
- <Condition Action="hide">NOT INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 OR NOT INSTALL_JETTY</Condition>
- <Condition Action="show">INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 AND INSTALL_JETTY</Condition>
- </Control>
- <Control Id="UpdateShibd_Pass" Type="Edit" X="250" Y="121" Height="17" Width="80"
- Property="JETTYD_PASSWORD.684B3207_0D64_43E6_9E6A_3ACB8B7672D7" Password="yes">
- <Condition Action="hide">NOT INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 OR NOT INSTALL_JETTY</Condition>
- <Condition Action="show">INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7 AND INSTALL_JETTY</Condition>
- </Control>
-
<!-- Stuff at the bottom: line, Back,Next, [space] Cancel -->
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="1" />
@@ -78,8 +39,6 @@
</Control>
<Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Text="&Next" Default="yes">
- <Publish Event="AddLocal" Value="InstallJetty">INSTALL_JETTY</Publish>
- <Publish Event="Remove" Value="InstallJetty">Not INSTALL_JETTY</Publish>
<Publish Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
</Control>
diff --git a/idp-installer/src/main/wix/scripts/shib_write_configs.vbs b/idp-installer/src/main/wix/scripts/shib_write_configs.vbs
index 41bd25a0b..d68be08a7 100644
--- a/idp-installer/src/main/wix/scripts/shib_write_configs.vbs
+++ b/idp-installer/src/main/wix/scripts/shib_write_configs.vbs
@@ -26,27 +26,25 @@ InstallDirJava = Replace(InstallDir, "\", "/")
InstallDirWindows = Replace(InstallDirJava, "/", "\\")
IdPHostName = LCase(msiProperties(1))
-InstallJetty = LCase(msiProperties(2))
-IdPScope = LCase(msiProperties(3))
+IdPScope = LCase(msiProperties(2))
if IdPScope = "" then
Domain = IdPHostName
else
Domain = IdPScope
end if
-DebugInstall = LCase(msiProperties(4))
-ConfigureAd = LCase(msiProperties(5))
+DebugInstall = LCase(msiProperties(3))
+ConfigureAd = LCase(msiProperties(4))
if ConfigureAd = "true" then
- AdDomain = LCase(msiProperties(6))
- AdUser = LCase(msiProperties(7))
- AdPass = msiProperties(8)
- AdUseGC = LCase(msiProperties(9))
+ 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
-LogFile.WriteLine "IntallJetty" & InstallJetty
set AntFile=FileSystemObj.OpenTextFile(InstallDir & "\idp.install.properties" , 2, True)
if (Err.Number = 0 ) then
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list