[java-identity-provider] branch dev/IDP-2136 updated: IDP-2136 Consider Splitting the Windows Installer into IdP and Jetty+Procrun
Rod Widdowson
rdw at steadingsoftware.com
Wed Jul 26 14:53:45 UTC 2023
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch dev/IDP-2136
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=85bf1455d1075ba1c39eb18262ddd0215283bd38
The following commit(s) were added to refs/heads/dev/IDP-2136 by this push:
new 85bf1455d IDP-2136 Consider Splitting the Windows Installer into IdP and Jetty+Procrun
85bf1455d is described below
commit 85bf1455d1075ba1c39eb18262ddd0215283bd38
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Jul 26 15:53:14 2023 +0100
IDP-2136 Consider Splitting the Windows Installer into IdP and Jetty+Procrun
https://shibboleth.atlassian.net/browse/IDP-2136
New Component GUIDs for all the jetty bits.
---
idp-installer/src/main/wix/Jetty-Delete.wxs | 6 +++---
idp-installer/src/main/wix/Jetty-Main.wxs | 2 +-
idp-installer/src/main/wix/Jetty-Procrun.wxs | 24 ++++++++++++------------
idp-installer/src/main/wix/Jetty-User.wxs | 2 +-
4 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/idp-installer/src/main/wix/Jetty-Delete.wxs b/idp-installer/src/main/wix/Jetty-Delete.wxs
index aee56b58d..e6c5fb858 100644
--- a/idp-installer/src/main/wix/Jetty-Delete.wxs
+++ b/idp-installer/src/main/wix/Jetty-Delete.wxs
@@ -19,7 +19,7 @@
<!-- Explicit delete behind ourselves on installs -->
<Fragment>
<ComponentGroup Id="DeleteFiles">
- <Component Id="RemoveOldJetty" Guid="{D98798EB-445C-425B-BBAA-9992F04B67EC}" Win64="no" Directory="IDP_INSTALLDIR">
+ <Component Id="RemoveOldJetty" Guid="{871D0584-3000-4E39-9C1F-19586A6F70C6}" Win64="no" Directory="IDP_INSTALLDIR">
<RegistryValue Id="RemoveOldJettyBaseEtc" Root="HKLM" Key="SOFTWARE\Shibboleth\IdP" Name="RemoveOldJettyBaseEtc" Value="TRUE" Type="string" KeyPath="yes" />
<util:RemoveFolderEx On="install" Property="OldJettyBaseEtc" />
<util:RemoveFolderEx On="install" Property="OldJettyBaseLib" />
@@ -28,12 +28,12 @@
<util:RemoveFolderEx On="both" Property="OldJettyBaseTmp" />
</Component>
- <Component Id="RemoveJettyDir" Guid="{557F0D43-F730-4912-BFE6-1905E69644A8}" Win64="no" Directory="TARGETDIR">
+ <Component Id="RemoveJettyDir" Guid="{35369D63-E95B-46B4-9431-7B8B35A7F85E}" Win64="no" Directory="TARGETDIR">
<RegistryValue Id="RemoveJettyDir" Root="HKLM" Key="SOFTWARE\Shibboleth\IdP" Name="JettyDir" Value="TRUE" Type="string" KeyPath="yes" />
<util:RemoveFolderEx On="install" Property="JettyDir" />
</Component>
- <Component Id="RemoveProcRunDir" Guid="{B77CAD20-5CCF-4DFC-A197-59859D0DF1C8}" Win64="no" Directory="TARGETDIR">
+ <Component Id="RemoveProcRunDir" Guid="{687EFCD0-9B56-4086-84EB-33A3C74CFEE2}" Win64="no" Directory="TARGETDIR">
<RegistryValue Id="RemoveProcRunDir" Root="HKLM" Key="SOFTWARE\Shibboleth\IdP" Name="ProcRunDir" Value="TRUE" Type="string" KeyPath="yes" />
<util:RemoveFolderEx On="install" Property="ProcRunDir" />
</Component>
diff --git a/idp-installer/src/main/wix/Jetty-Main.wxs b/idp-installer/src/main/wix/Jetty-Main.wxs
index 219c939d3..22074498a 100644
--- a/idp-installer/src/main/wix/Jetty-Main.wxs
+++ b/idp-installer/src/main/wix/Jetty-Main.wxs
@@ -68,7 +68,7 @@
</Directory>
</Directory>
- <Component Id="Icon" Guid="{948A6709-00B7-49B5-947D-3346DC1C9AC3}" Directory="IDP_INSTALLDIR" Win64="yes">
+ <Component Id="Icon" Guid="{C866B1EC-63E2-4379-BAA3-4D3936AE1BEC}" Directory="IDP_INSTALLDIR" Win64="yes">
<RegistryValue Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductCode]" Name="DisplayIcon" Value="[IDP_INSTALLDIR]\shib.ico,0" Type="string" />
</Component>
diff --git a/idp-installer/src/main/wix/Jetty-Procrun.wxs b/idp-installer/src/main/wix/Jetty-Procrun.wxs
index 43f21c24f..0cc1ae656 100644
--- a/idp-installer/src/main/wix/Jetty-Procrun.wxs
+++ b/idp-installer/src/main/wix/Jetty-Procrun.wxs
@@ -26,19 +26,19 @@
</Fragment>
<Fragment>
<ComponentGroup Id="ProcrunGroup">
- <Component Id="procrun_license" Directory="PROCRUNROOT" Guid="{97B4CECC-5D1E-47BB-87B9-8F9FCEBB8158}">
+ <Component Id="procrun_license" Directory="PROCRUNROOT" Guid="{03024B30-C81A-47D1-B52C-488A8786D5BF}">
<File Id="file_procrun_license" KeyPath="yes" Source="$(var.ProcrunSrc)\LICENSE.txt" />
</Component>
- <Component Id="procrun_notice" Directory="PROCRUNROOT" Guid="{C1F42755-C7A8-437F-9965-95FF22F94CDC}">
+ <Component Id="procrun_notice" Directory="PROCRUNROOT" Guid="{6F141D2D-4138-40DD-85A0-FEFBF7BBE54F}">
<File Id="file_procrun_notice" KeyPath="yes" Source="$(var.ProcrunSrc)\NOTICE.txt" />
</Component>
- <Component Id="procrun_mgr" Directory="PROCRUNROOT" Guid="{E24E17EE-684F-42E0-B481-1CBBC084A861}">
+ <Component Id="procrun_mgr" Directory="PROCRUNROOT" Guid="{68387254-C37C-4F6B-A4A6-8174BA1FE9FC}">
<File Id="file_procrun_mgr" KeyPath="yes" Source="$(var.ProcrunSrc)\prunmgr.exe" Name="$(var.ServiceName)w.exe" />
</Component>
- <Component Id="procrun_relnotes" Directory="PROCRUNROOT" Guid="{F0B94ECE-2029-43E6-B9AE-11A6C782D7D5}">
+ <Component Id="procrun_relnotes" Directory="PROCRUNROOT" Guid="{DBDBFF9F-D7D0-42B1-A992-87565473A1C7}">
<File Id="procrun_relnotes" KeyPath="yes" Source="$(var.ProcrunSrc)\RELEASE-NOTES.txt" />
</Component>
- <Component Id="procrun_permissions" Directory="PROCRUNROOT" Guid="{C6B2ABD3-68BD-459F-BE86-2CA0DB52A638}" KeyPath="yes">
+ <Component Id="procrun_permissions" Directory="PROCRUNROOT" Guid="{47F3846B-42DE-4B80-9F24-4F2831CF3AA9}" KeyPath="yes">
<RegistryKey ForceCreateOnInstall="yes" Key="SOFTWARE\Apache Software Foundation\Procrun 2.0\$(var.ServiceName)" Root="HKLM">
<Permission User="Administrators" GenericAll="yes" />
<Permission User="SYSTEM" GenericAll="yes" />
@@ -53,7 +53,7 @@
<!-- Install the service. -->
- <Component Id="procrun_service" Directory="dir64" Guid="{2673BCBE-3659-4AC6-B39C-DF1EEDF72C0E}">
+ <Component Id="procrun_service" Directory="dir64" Guid="{D5390673-A3C7-423A-975E-BB2684513ED0}">
<Condition>VersionNT64 And Not Intel64</Condition>
<File Id="file_procrun_AMD64_service" KeyPath="yes" Source="$(var.ProcrunSrc)\amd64\prunsrv.exe" Name="$(var.ServiceName).exe" />
<ServiceInstall Id="ServiceX64" Name="$(var.ServiceName)" DisplayName="Shibboleth IdP Daemon" Description="Runs the Jetty Container"
@@ -62,14 +62,14 @@
<util:ServiceConfig FirstFailureActionType="none" SecondFailureActionType="none" ThirdFailureActionType="none"/>
</ServiceInstall>
</Component>
- <Component Id="procrun_Firewall" Directory="dir64" Guid="{BC605FF4-0233-4332-BC90-0C2E5FEC37D2}" KeyPath="yes">
+ <Component Id="procrun_Firewall" Directory="dir64" Guid="{305B9114-289B-4D9B-B616-73082D659067}" KeyPath="yes">
<Condition>NOT NO_FIREWALL And VersionNT64 And Not Intel64</Condition>
<fw:FirewallException Id="Win64Shibd_idp" Program="[#file_procrun_AMD64_service]" Name="Win64Shibd_idp" Description="The Shibboleth IdP Daemon" Protocol="tcp" Scope="any" />
</Component>
<!-- Configure the service -->
- <Component Id="ServiceParameters" Directory="PROCRUNROOT" Guid="{EC1EA760-0113-4CAD-9719-ADFF1885FC53}" KeyPath="yes">
+ <Component Id="ServiceParameters" Directory="PROCRUNROOT" Guid="{EBC566D8-0B22-4625-98E8-C8506A6892B5}" KeyPath="yes">
<Condition>NOT Installed</Condition>
<!-- Start component here - that way if the start fails the user will be prompted and things will continue with the service declared. -->
<RegistryKey ForceDeleteOnUninstall="yes" ForceCreateOnInstall="yes" Key="SYSTEM\CurrentControlSet\services\$(var.ServiceName)\Parameters" Root="HKLM">
@@ -80,7 +80,7 @@
<ServiceControl Id="controlService" Name="$(var.ServiceName)" Stop="install" Start="install" Wait="no" />
<ServiceControl Id="controlServiceUninstall" Name="$(var.ServiceName)" Stop="uninstall" Remove="uninstall" Wait="yes" />
</Component>
- <Component Id="StartParameters" Directory="PROCRUNROOT" Guid="{F4D1B5FA-F7CC-4693-9123-84B960DB98B0}" KeyPath="yes">
+ <Component Id="StartParameters" Directory="PROCRUNROOT" Guid="{E9C5155E-F44D-4A10-9CEB-5CC2D683CD8A}" KeyPath="yes">
<!-- ForceDeleteOnUninstall stops us accumulating Stop keys -->
<RegistryKey ForceDeleteOnUninstall="yes" ForceCreateOnInstall="yes" Key="SOFTWARE\Apache Software Foundation\Procrun 2.0\$(var.ServiceName)\Parameters\Start" Root="HKLM">
<RegistryValue Name="Class" Value="org.eclipse.jetty.start.Main" Type="string"/>
@@ -97,7 +97,7 @@
<Permission Domain="[JETTYD_DOMAIN]" User="[PERMISSION_USER]" GenericRead="yes" GenericExecute="yes" Read="yes" />
</RegistryKey>
</Component>
- <Component Id="StopParameters" Directory="PROCRUNROOT" Guid="{BB7062F1-573B-40BF-A761-21C31A897881}" KeyPath="yes">
+ <Component Id="StopParameters" Directory="PROCRUNROOT" Guid="{F436CF79-B29E-45D7-B0D0-7181949CB9B3}" KeyPath="yes">
<RegistryKey ForceDeleteOnUninstall="yes" ForceCreateOnInstall="yes" Key="SOFTWARE\Apache Software Foundation\Procrun 2.0\$(var.ServiceName)\Parameters\Stop" Root="HKLM">
<RegistryValue Name="Class" Value="org.eclipse.jetty.start.Main" Type="string"/>
<RegistryValue Name="Mode" Value="jvm" Type="string"/>
@@ -114,7 +114,7 @@
<Permission Domain="[JETTYD_DOMAIN]" User="[PERMISSION_USER]" GenericRead="yes" GenericExecute="yes" Read="yes" />
</RegistryKey>
</Component>
- <Component Id="LogParameters" Directory="PROCRUNROOT" Guid="{0FA07510-6387-4D0D-8984-86C17759B745}" KeyPath="yes">
+ <Component Id="LogParameters" Directory="PROCRUNROOT" Guid="{4D3AD97F-9646-4399-B071-93AB48A4E4C1}" KeyPath="yes">
<RegistryKey ForceDeleteOnUninstall="yes" ForceCreateOnInstall="yes" Key="SOFTWARE\Apache Software Foundation\Procrun 2.0\$(var.ServiceName)\Parameters\Log" Root="HKLM">
<RegistryValue Name="Path" Value="[PROCRUNROOT]\log" Type="string" />
<RegistryValue Name="StdError" Value="auto" Type="string" />
@@ -124,7 +124,7 @@
<Permission Domain="[JETTYD_DOMAIN]" User="[PERMISSION_USER]" GenericRead="yes" GenericExecute="yes" Read="yes" />
</RegistryKey>
</Component>
- <Component Id="JavaParameters" Directory="PROCRUNROOT" Guid="{62BACF23-6B8B-43C6-9B37-3992D6B86E5C}" KeyPath="yes">
+ <Component Id="JavaParameters" Directory="PROCRUNROOT" Guid="{E7BF22CE-465C-4A77-B518-E13EEFF0A0BC}" KeyPath="yes">
<RegistryKey ForceDeleteOnUninstall="yes" ForceCreateOnInstall="yes" Key="SOFTWARE\Apache Software Foundation\Procrun 2.0\$(var.ServiceName)\Parameters\Java" Root="HKLM">
<RegistryValue Name="JavaHome" Value="[%JAVA_HOME]" Type="string" />
<RegistryValue Name="Jvm" Value="auto" Type="string" />
diff --git a/idp-installer/src/main/wix/Jetty-User.wxs b/idp-installer/src/main/wix/Jetty-User.wxs
index b9a461390..e7878ab0f 100644
--- a/idp-installer/src/main/wix/Jetty-User.wxs
+++ b/idp-installer/src/main/wix/Jetty-User.wxs
@@ -60,7 +60,7 @@
</Property>
<!-- Save settings -->
<DirectoryRef Id="TARGETDIR">
- <Component Id="SaveUserInfo" Guid="{B5B909A2-E246-4069-808D-7F3AC98D062B}" Win64="no">
+ <Component Id="SaveUserInfo" Guid="{871D0584-3000-4E39-9C1F-19586A6F70C6}" Win64="no">
<RegistryValue Id="targetRegShibUser" Root="HKLM" Key="SOFTWARE\Shibboleth\IdP" Name="JettydUser" Value="[JETTYD_USER]" Type="string" />
<RegistryValue Id="targetRegShibDomain" Root="HKLM" Key="SOFTWARE\Shibboleth\IdP" Name="JettydDomain" Value="[JETTYD_DOMAIN]" Type="string" />
<RegistryValue Id="targetRegInstallShibUser" Root="HKLM" Key="SOFTWARE\Shibboleth\IdP" Name="InstallJettydUser" Value="[INSTALL_JETTYD_USER]" Type="string" />
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list