[java-identity-provider] 02/03: IDP-2136 Consider Splitting the Windows Installer into IdP and Jetty+Procrun

[Rod Widdowson]

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=93d0cf75063fe07e326a93f39e05d8e909157ba2

commit 93d0cf75063fe07e326a93f39e05d8e909157ba2
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Aug 1 15:58:35 2023 +0100

    IDP-2136 Consider Splitting the Windows Installer into IdP and Jetty+Procrun
    
    https://shibboleth.atlassian.net/browse/IDP-2136
    
    Strip out more unsuded registry settings
---
 idp-installer/src/main/wix/ShibbolethIdP-registry.wxs | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/idp-installer/src/main/wix/ShibbolethIdP-registry.wxs b/idp-installer/src/main/wix/ShibbolethIdP-registry.wxs
index 3b41b0106..52ab49ef5 100644
--- a/idp-installer/src/main/wix/ShibbolethIdP-registry.wxs
+++ b/idp-installer/src/main/wix/ShibbolethIdP-registry.wxs
@@ -21,7 +21,6 @@
         <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" />
-                <RegistryValue Id="targetRegJetty" Root="HKLM" Key="SOFTWARE\Shibboleth\IdP" Name="InstallJetty" Value="[INSTALL_JETTY]" Type="string" />
             </Component>
             <!-- pretty icon for the "install programs" page -->
             <Component Id="shib.ico" Guid="{7F4CE60B-A27B-4E07-8DD9-19F16B008C56}" Directory="INSTALLDIR" Win64="yes">
@@ -33,27 +32,12 @@
         <Property Id="OLD_INSTALLDIR" Secure="yes">
             <RegistrySearch Id="OldInstallDir" Root="HKLM" Key="SOFTWARE\Shibboleth\IdP" Name="InstallDir" Type="directory" Win64="no" />
         </Property>
-        <Property Id="OLD_INSTALL_JETTY" Secure="yes">
-            <RegistrySearch Id="OldInstallJetty" Root="HKLM" Key="SOFTWARE\Shibboleth\IdP" Name="InstallJetty" Type="raw" 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 -->
-        <Property Id="INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7" Secure="yes"/>
-        <Property Id="JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7" Secure="yes"/>
-        <Property Id="JETTYD_PASSWORD.684B3207_0D64_43E6_9E6A_3ACB8B7672D7" Secure="yes" Hidden="yes"/>
-        <Property Id="OLD_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7" Secure="yes">
-            <RegistrySearch Id="OldJettydUser" Root="HKLM" Key="SOFTWARE\Shibboleth\IdP" Name="JettydUser" Type="raw" Win64="no" />
-        </Property>
-        <Property Id="OLD_JETTYD_DOMAIN.684B3207_0D64_43E6_9E6A_3ACB8B7672D7" Secure="yes">
-            <RegistrySearch Id="OldJettydDomain" Root="HKLM" Key="SOFTWARE\Shibboleth\IdP" Name="JettydDomain" Type="raw" Win64="no" />
-        </Property>
-        <Property Id="OLD_INSTALL_JETTYD_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7" Secure="yes">
-            <RegistrySearch Id="OldInstallJettydUser" Root="HKLM" Key="SOFTWARE\Shibboleth\IdP" Name="InstallJettydUser" Type="raw" Win64="no" />
-        </Property>
     </Fragment>
 </Wix>
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.