[java-identity-provider] 06/07: IDP-2136 Consider Splitting the Windows Installer into IdP and Jetty+Procrun
Rod Widdowson
rdw at steadingsoftware.com
Sat Jul 29 14:30:15 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=c41aa98d0dfcee3c58036fc8332239b15af54978
commit c41aa98d0dfcee3c58036fc8332239b15af54978
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Jul 27 14:22:31 2023 +0100
IDP-2136 Consider Splitting the Windows Installer into IdP and Jetty+Procrun
https://shibboleth.atlassian.net/browse/IDP-2136
Remove all the Jetty MSI building files from the IdP.
---
idp-installer/src/main/wix/Jetty-Delete.wxs | 61 ------
idp-installer/src/main/wix/Jetty-Gui.wxs | 116 -----------
idp-installer/src/main/wix/Jetty-InstallDlg.wxs | 81 --------
idp-installer/src/main/wix/Jetty-Main.wxs | 116 -----------
idp-installer/src/main/wix/Jetty-Procrun.wxs | 164 ----------------
idp-installer/src/main/wix/Jetty-User.wxs | 166 ----------------
idp-installer/src/main/wix/Jetty.bat | 154 ---------------
idp-installer/src/main/wix/Jetty.wixproj | 38 ----
idp-installer/src/main/wix/JettyNew.bat | 212 ---------------------
idp-installer/src/main/wix/MergeModule.wxs | 61 ------
.../src/main/wix/scripts/jetty_script.vbs | 14 --
11 files changed, 1183 deletions(-)
diff --git a/idp-installer/src/main/wix/Jetty-Delete.wxs b/idp-installer/src/main/wix/Jetty-Delete.wxs
deleted file mode 100644
index e6c5fb858..000000000
--- a/idp-installer/src/main/wix/Jetty-Delete.wxs
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- licenses this file to You 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>
- <ComponentGroup Id="DeleteFiles">
- <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" />
- <util:RemoveFolderEx On="install" Property="OldJettyBaseResources" />
- <util:RemoveFolderEx On="install" Property="OldJettyBaseWebapps" />
- <util:RemoveFolderEx On="both" Property="OldJettyBaseTmp" />
- </Component>
-
- <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="{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>
-
- </ComponentGroup>
- <CustomAction Id="SetOldJettyBaseEtc" Property="OldJettyBaseEtc" Value="[IDP_INSTALLDIR]\jetty-base\etc" />
- <CustomAction Id="SetOldJettyBaseLib" Property="OldJettyBaseLib" Value="[IDP_INSTALLDIR]\jetty-base\lib" />
- <CustomAction Id="SetOldJettyBaseResources" Property="OldJettyBaseResources" Value="[IDP_INSTALLDIR]\jetty-base\resources" />
- <CustomAction Id="SetOldJettyBaseWebapps" Property="OldJettyBaseWebapps" Value="[IDP_INSTALLDIR]\jetty-base\webapps" />
- <CustomAction Id="SetOldJettyBaseTmp" Property="OldJettyBaseRmp" Value="[IDP_INSTALLDIR]\jetty-base\tmp" />
- <CustomAction Id="SetProcRunDir" Property="ProcRunDir" Value="[SHIBBOLETHDIR]\ProcRun" />
- <CustomAction Id="SetJettyDir" Property="JettyDir" Value="[SHIBBOLETHDIR]\Jetty" />
-
- <InstallExecuteSequence>
- <Custom Action="SetOldJettyBaseEtc" After="AppSearch" />
- <Custom Action="SetOldJettyBaseLib" After="AppSearch" />
- <Custom Action="SetOldJettyBaseResources" After="AppSearch" />
- <Custom Action="SetOldJettyBaseWebapps" After="AppSearch" />
- <Custom Action="SetOldJettyBaseTmp" After="AppSearch" />
- <Custom Action="SetProcRunDir" After="AppSearch" />
- <Custom Action="SetJettyDir" After="AppSearch" />
- </InstallExecuteSequence>
-
- </Fragment>
-</Wix>
diff --git a/idp-installer/src/main/wix/Jetty-Gui.wxs b/idp-installer/src/main/wix/Jetty-Gui.wxs
deleted file mode 100644
index 8b21bdd3c..000000000
--- a/idp-installer/src/main/wix/Jetty-Gui.wxs
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
-Development, Inc. (UCAID) under one or more contributor license
-agreements. See the NOTICE file distributed with this work for
-additional information regarding copyright ownership. The UCAID
-licenses this file to You 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 Jetty installer. Cloned and modified from the IdP -->
-
- <!-- Property that Light complained for -->
- <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
-
- <UI Id="JettyInstallUI">
-
- <!-- "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 one dialog -->
- <DialogRef Id="InstallJetty" />
-
- <!-- 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="InstallJetty">
- 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="InstallJetty">
- (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="InstallJetty">
- NOT Installed OR PATCH
- </Publish>
- <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg">
- Installed AND NOT PATCH
- </Publish>
-
- <ProgressText Action="QtSetACEConf">Setting the ACLs on the idp conf directory</ProgressText>
- <ProgressText Action="QtSetACECreds">Setting the ACLs on the idp credentials directory</ProgressText>
- <ProgressText Action="QtSetACELogs">Setting the ACLs on the idp logs directory</ProgressText>
- <ProgressText Action="QtSetACEJettyLog">Setting the ACLs on the jetty-base logs directory</ProgressText>
- <ProgressText Action="QtSetACEJettyTmp">Setting the ACLs on the jetty-base tmp directory</ProgressText>
- <ProgressText Action="QtSetACEJettyStart">Setting the ACLs on the jetty-base start.d directory</ProgressText>
- <ProgressText Action="WixRemoveFoldrrsEx">Cleaning out previous install</ProgressText>
-
- </UI>
- </Fragment>
-</Wix>
diff --git a/idp-installer/src/main/wix/Jetty-InstallDlg.wxs b/idp-installer/src/main/wix/Jetty-InstallDlg.wxs
deleted file mode 100644
index 2563a7f6b..000000000
--- a/idp-installer/src/main/wix/Jetty-InstallDlg.wxs
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- licenses this file to You 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">
- <Fragment>
- <UI>
- <!-- This Dialog sets up INSTALL_JETTYD_USER, JETTYD_USER, JETTYD_DOMAIN, JETTYD_PASSWORD -->
-
- <Dialog Id="InstallJetty" 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 Select whether to run as a captive user" Transparent="yes" />
- <Control Id="TopLine" Type="Line" X="0" Y="44" Width="370" Height="1" />
-
- <Control Id="InstallJettyD" Type="CheckBox" X="25" Y="52" Height="20" Width="60"
- Property="INSTALL_JETTYD_USER" CheckBoxValue="TRUE" Text="Run As &User"/>
-
- <Control Id="DescriptionLine3A" Type="Text" X="25" Y="76" Height="20" Width="60" Text="User Domain">
- <Condition Action="hide">NOT INSTALL_JETTYD_USER</Condition>
- <Condition Action="show">INSTALL_JETTYD_USER</Condition>
- </Control>
- <Control Id="Shibd_Domain" Type="Edit" X="85" Y="74" Height="17" Width="80"
- Property="JETTYD_DOMAIN" Text="[JETTYD_DOMAIN]">
- <Condition Action="hide">NOT INSTALL_JETTYD_USER</Condition>
- <Condition Action="show">INSTALL_JETTYD_USER</Condition>
- </Control>
-
- <Control Id="DescriptionLine3B" Type="Text" X="25" Y="96" Height="20" Width="60" Text="Username">
- <Condition Action="hide">NOT INSTALL_JETTYD_USER</Condition>
- <Condition Action="show">INSTALL_JETTYD_USER</Condition>
- </Control>
- <Control Id="Shibd_User" Type="Edit" X="85" Y="94" Height="17" Width="80"
- Property="JETTYD_USER" Text="[JETTYD_USER]">
- <Condition Action="hide">NOT INSTALL_JETTYD_USER</Condition>
- <Condition Action="show">INSTALL_JETTYD_USER</Condition>
- </Control>
-
- <Control Id="DescriptionLine3C" Type="Text" X="25" Y="116" Height="20" Width="60" Text="Password">
- <Condition Action="hide">NOT INSTALL_JETTYD_USER</Condition>
- <Condition Action="show">INSTALL_JETTYD_USER</Condition>
- </Control>
- <Control Id="Shibd_Pass" Type="Edit" X="85" Y="114" Height="17" Width="80"
- Property="JETTYD_PASSWORD" Password="yes">
- <Condition Action="hide">NOT INSTALL_JETTYD_USER</Condition>
- <Condition Action="show">INSTALL_JETTYD_USER</Condition>
- </Control>
-
- <!-- 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="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-installer/src/main/wix/Jetty-Main.wxs b/idp-installer/src/main/wix/Jetty-Main.wxs
deleted file mode 100644
index 22074498a..000000000
--- a/idp-installer/src/main/wix/Jetty-Main.wxs
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- licenses this file to You 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="FB2B7404-37B2-4CE5-8E2E-EEB53F9FF472"?>
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <Product Id="*" Name="Jetty Installer for the Shibboleth IdP V5" Language="1033" Version="11.0.13.0" Manufacturer="The Shibboleth Consortium" UpgradeCode="$(var.UpgradeUUID)">
- <Package InstallerVersion="310" Compressed="yes" InstallScope="perMachine" Platform="x64" Description="Jetty Installation for 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>
- <Condition Message="IDP not installed">IDP_INSTALLDIR</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="Jetty" Level="1">
- <ComponentGroupRef Id="ProcrunGroup" /> <!--procrun.wxs-->
- <ComponentGroupRef Id="JettyGroup" /> <!--heat -->
- <ComponentGroupRef Id="JettyBaseGroup" /> <!-- heat -->
-
- <ComponentGroupRef Id="DeleteFiles" /> <!--DOne-->
- <ComponentRef Id="SaveUserInfo" />
- <ComponentRef Id="Icon" />
- </Feature>
-
- <Directory Id="TARGETDIR" Name="SourceDir">
- <Directory Id="CommonAppDataFolder">
- <Directory Id="ProgramDataShib" Name="Shibboleth">
- <Directory Id="IDPDISTDIR" Name="IdP"/>
- </Directory>
- </Directory>
- <Directory Id="ProgramFilesFolder">
- <Directory Id="SHIBBOLETHDIR" Name="Shibboleth" >
- <Directory Id="JETTYROOT" Name="Jetty" />
- <Directory Id="PROCRUNROOT" Name="ProcRun" />
- </Directory>
- </Directory>
- <Directory Id="IDP_INSTALLDIR">
- <Directory Id="JettyBaseFolder" Name="jetty-base">
- <Directory Id="StartDotD" Name="start.d" />
- <Directory Id="JettyLogs" Name="logs" />
- <Directory Id="JettyTmp" Name="tmp" />
- </Directory>
- </Directory>
- </Directory>
-
- <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>
-
- <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="SHIBBOLETHDIR" ExeCommand="[QtFinalizeJetty]" Execute="deferred" Impersonate="no" />
- <CustomAction Id="QtFinalizeJetty" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
-
- <InstallExecuteSequence>
- <Custom Action="SetFinalizeJetty" After="InstallFiles">(NOT Installed)</Custom>
- <Custom Action="RunFinalizeJetty" After="SetFinalizeJetty">(NOT Installed) AND DEBUG_INSTALL</Custom>
- <Custom Action="QtFinalizeJetty" After="RunFinalizeJetty">(NOT Installed) AND (NOT DEBUG_INSTALL)</Custom>
- </InstallExecuteSequence>
-
- <!-- Parameters: See also Jetty-User -->
- <Property Id="ALWAYS_START_SERVICE" Value="TRUE" Secure="yes" />
- <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>
-
- <!-- Environment -->
-
- <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="UcrtnSearch" Name="ucrtbase.dll" />
- </DirectorySearch>
- </Property>
-
- <Property Id="IDP_INSTALLDIR" Secure="yes">
- <RegistrySearch Id="OldInstallDir" Root="HKLM" Key="SOFTWARE\Shibboleth\IdP" Name="InstallDir" Type="directory" Win64="no" />
- </Property>
-
- <Upgrade Id="$(var.UpgradeUUID)">
- <UpgradeVersion ExcludeLanguages="yes" IncludeMaximum="yes" Maximum="127.255.255" Minimum="0.0.1" OnlyDetect="yes" Property="ALREADYINSTALLED" />
- </Upgrade>
-
- <UIRef Id="JettyInstallUI" />
-
- </Product>
-</Wix>
diff --git a/idp-installer/src/main/wix/Jetty-Procrun.wxs b/idp-installer/src/main/wix/Jetty-Procrun.wxs
deleted file mode 100644
index 0cc1ae656..000000000
--- a/idp-installer/src/main/wix/Jetty-Procrun.wxs
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- licenses this file to You 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:fw="http://schemas.microsoft.com/wix/FirewallExtension"
- xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
- <?define ServiceStart="auto"?>
- <?define ServiceName="shibd_idp"?>
- <Fragment>
- <DirectoryRef Id="PROCRUNROOT">
- <Directory Id="dir64" Name="amd64" />
- <Directory Id="procrunLogFolder" Name="log" />
- </DirectoryRef>
- </Fragment>
- <Fragment>
- <ComponentGroup Id="ProcrunGroup">
- <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="{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="{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="{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="{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" />
- <Permission Domain="[JETTYD_DOMAIN]" User="[PERMISSION_USER]" GenericRead="yes" GenericExecute="yes" Read="yes" />
- </RegistryKey>
- <CreateFolder Directory="procrunLogFolder">
- <Permission User="Administrators" GenericAll="yes" />
- <Permission User="SYSTEM" GenericAll="yes" />
- <Permission Domain="[JETTYD_DOMAIN]" User="[PERMISSION_USER]" GenericAll="yes" />
- </CreateFolder>
- </Component>
-
- <!-- Install the service. -->
-
- <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"
- Arguments="service $(var.ServiceName)" Type="ownProcess" Start="$(var.ServiceStart)" ErrorControl="ignore"
- Account="[SERVICE_USER]" Password="[JETTYD_PASSWORD]">
- <util:ServiceConfig FirstFailureActionType="none" SecondFailureActionType="none" ThirdFailureActionType="none"/>
- </ServiceInstall>
- </Component>
- <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="{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">
- <Permission User="Administrators" GenericAll="yes" />
- <Permission User="SYSTEM" GenericAll="yes" />
- <Permission Domain="[JETTYD_DOMAIN]" User="[PERMISSION_USER]" GenericRead="yes" GenericExecute="yes" Read="yes" />
- </RegistryKey>
- <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="{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"/>
- <RegistryValue Name="Mode" Value="jvm" Type="string"/>
- <RegistryValue Name="Params" Type="multiString" Action="append">
- <MultiStringValue>STOP.PORT=8963</MultiStringValue>
- <MultiStringValue>STOP.Key=[JETTY_PASS]</MultiStringValue>
- <MultiStringValue>jetty.base=[IDP_INSTALLDIR]\jetty-base</MultiStringValue>
- <MultiStringValue>jetty.logging.dir=[IDP_INSTALLDIR]\jetty-base\logs</MultiStringValue>
- </RegistryValue>
- <RegistryValue Name="WorkingPath" Type="string" Value="[IDP_INSTALLDIR]\jetty-base\"/>
- <Permission User="Administrators" GenericAll="yes" />
- <Permission User="SYSTEM" GenericAll="yes" />
- <Permission Domain="[JETTYD_DOMAIN]" User="[PERMISSION_USER]" GenericRead="yes" GenericExecute="yes" Read="yes" />
- </RegistryKey>
- </Component>
- <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"/>
- <RegistryValue Name="Params" Type="multiString" Action="append">
- <MultiStringValue>--stop</MultiStringValue>
- <MultiStringValue>STOP.PORT=8963</MultiStringValue>
- <MultiStringValue>STOP.Key=[JETTY_PASS]</MultiStringValue>
- <MultiStringValue>jetty.base=[IDP_INSTALLDIR]\jetty-base</MultiStringValue>
- <MultiStringValue>jetty.logging.dir=[IDP_INSTALLDIR]\jetty-base\logs</MultiStringValue>
- </RegistryValue>
- <RegistryValue Name="WorkingPath" Type="string" Value="[IDP_INSTALLDIR]\jetty-base\"/>
- <Permission User="Administrators" GenericAll="yes" />
- <Permission User="SYSTEM" GenericAll="yes" />
- <Permission Domain="[JETTYD_DOMAIN]" User="[PERMISSION_USER]" GenericRead="yes" GenericExecute="yes" Read="yes" />
- </RegistryKey>
- </Component>
- <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" />
- <RegistryValue Name="StdOutput" Value="auto" Type="string" />
- <Permission User="Administrators" GenericAll="yes" />
- <Permission User="SYSTEM" GenericAll="yes" />
- <Permission Domain="[JETTYD_DOMAIN]" User="[PERMISSION_USER]" GenericRead="yes" GenericExecute="yes" Read="yes" />
- </RegistryKey>
- </Component>
- <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" />
- <RegistryValue Name="Classpath" Value="[JETTYROOT]\start.jar" Type="string" />
- <RegistryValue Name="Options" Type="multiString">
- <MultiStringValue>-Didp.home=[JAVA_IDP_HOME]</MultiStringValue>
- <MultiStringValue>-Djdk.tls.ephemeralDHKeySize=2048</MultiStringValue>
- <MultiStringValue>-Dorg.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.Slf4jLog</MultiStringValue>
- <MultiStringValue>-Djava.io.tmpdir=[JAVA_IDP_HOME]/jetty-base/tmp</MultiStringValue>
- <MultiStringValue>-XX:+UseG1GC</MultiStringValue>
- </RegistryValue>
- <RegistryValue Name="JvmMx" Value="[JAVA_JVMMX]" Type="string">
- <!-- Its an integer, but we added the # -->
- </RegistryValue>
- <Permission User="Administrators" GenericAll="yes" />
- <Permission User="SYSTEM" GenericAll="yes" />
- <Permission Domain="[JETTYD_DOMAIN]" User="[PERMISSION_USER]" GenericRead="yes" GenericExecute="yes" Read="yes" />
- </RegistryKey>
- </Component>
- </ComponentGroup>
-
- <Binary Id="PropertyWorkSrc" SourceFile="scripts\jetty_script.vbs" />
- <CustomAction Id="PropertyWork" BinaryKey="PropertyWorkSrc" VBScriptCall="" Execute="immediate" />
- <CustomAction Id="SetJavaJvmMx" Property="JAVA_JVMMX" Value="#2048" />
-
- <InstallExecuteSequence>
- <!-- Do/Do Not not start service -->
- <StartServices>(ALWAYS_START_SERVICE = "TRUE")</StartServices>
- <!-- Setup JAVA_IDP_HOME before we use it -->
- <Custom Action="PropertyWork" After="AppSearch" />
- <!-- Preserve Jetty parms -->
- <Custom Action="SetJavaJvmMx" After="AppSearch">(NOT Installed) AND (NOT JAVA_JVMMX)</Custom>
- </InstallExecuteSequence>
-
-
- </Fragment>
-</Wix>
diff --git a/idp-installer/src/main/wix/Jetty-User.wxs b/idp-installer/src/main/wix/Jetty-User.wxs
deleted file mode 100644
index 08183f2e2..000000000
--- a/idp-installer/src/main/wix/Jetty-User.wxs
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- licenses this file to You 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:fw="http://schemas.microsoft.com/wix/FirewallExtension"
- xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-
- <!-- User management for a dedicate process.
- Input Properties- Created by the GUI.
- NO Inheritance if not the GUI.
-
- JETTYD_USER - The user name.
- Must be supplied on GUIless installs if INSTALL_JETTYD_USER is TRUE
- Saved and reloaded on updates (for GUI use only)
-
- JETTYD_DOMAIN - Domain, defaults to [%USERDOMAIN] in the GUI
- Must be supplied on GUIless installs if INSTALL_JETTYD_USER is TRUE
- Saved and reloaded on updates (for GUI use only)
-
- INSTALL_JETTYD_USER - Are we configuring a specific user to run the IdP.
- Saved and reloaded on updates (for GUI use only)
-
- JETTYD_PASSWORD - The password. Never saved. Must be provided if INSTALL_JETTYD_USER is true.
-
- Created Properties
- SERVICE_USER - Username to the service.
- Only set up if a user (and domain) is specified
-
- PERMISSION_USER - Administrators if no input supplied otherwise [JETTYD_USER]
- Used in 'Permission' statments
-
- ACE_USER - [JETTYD_DOMAIN]\[PERMISSION_USER] if JETTYD_DOMAIN supplied
- [PERMISSION_USER] Otherwise
- used in icacles
- -->
-
- <Fragment>
-
- <!-- Restore saved settings -->
- <Property Id="OLD_JETTYD_USER" Secure="yes">
- <RegistrySearch Id="OldJettydUser" Root="HKLM" Key="SOFTWARE\Shibboleth\IdP" Name="JettydUser" Type="raw" Win64="no" />
- </Property>
- <Property Id="OLD_JETTYD_DOMAIN" Secure="yes">
- <RegistrySearch Id="OldJettydDomain" Root="HKLM" Key="SOFTWARE\Shibboleth\IdP" Name="JettydDomain" Type="raw" Win64="no" />
- </Property>
- <Property Id="OLD_INSTALL_JETTYD_USER" Secure="yes">
- <RegistrySearch Id="OldInstallJettydUser" Root="HKLM" Key="SOFTWARE\Shibboleth\IdP" Name="InstallJettydUser" Type="raw" Win64="no" />
- </Property>
- <!-- Save settings -->
- <DirectoryRef Id="TARGETDIR">
- <Component Id="SaveUserInfo" Guid="{E1E006C0-37D4-438B-97D0-64E1A089DCE8}" 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" />
- </Component>
- </DirectoryRef>
-
- <!-- Set up work properties for GUI -->
- <CustomAction Id="InheritJettydUser" Property="JETTYD_USER" Value="[OLD_JETTYD_USER]" />
- <CustomAction Id="InheritJettydDomain" Property="JETTYD_DOMAIN" Value="[OLD_JETTYD_DOMAIN]" />
- <CustomAction Id="SetJettydDomain" Property="JETTYD_DOMAIN" Value="[%USERDOMAIN]" />
- <CustomAction Id="InheritInstallJettydUser" Property="INSTALL_JETTYD_USER" Value="[OLD_INSTALL_JETTYD_USER]" />
- <CustomAction Id="SetInstallJettydUser" Property="INSTALL_JETTYD_USER" Value="TRUE" />
-
- <InstallUISequence>
- <Custom Action="InheritJettydUser" After="AppSearch">OLD_JETTYD_USER AND NOT JETTYD_USER</Custom>
- <Custom Action="InheritJettydDomain" After="AppSearch">OLD_JETTYD_DOMAIN AND NOT JETTYD_DOMAIN</Custom>
- <Custom Action="SetJettydDomain" After="AppSearch">NOT OLD_JETTYD_DOMAIN AND NOT JETTYD_DOMAIN</Custom>
- <Custom Action="InheritInstallJettydUser" After="InheritJettydUser">OLD_INSTALL_JETTYD_USER AND NOT JETTYD_USER</Custom>
- <Custom Action="SetInstallJettydUser" After="InheritJettydUser">JETTYD_USER</Custom>
- </InstallUISequence>
-
- <!-- Set up work properties for the installer -->
- <CustomAction Id="PermissionUserSpecified" Property="PERMISSION_USER" Value="[JETTYD_USER]"/>
- <CustomAction Id="PermissionUserDefault" Property="PERMISSION_USER" Value="Administrators"/>
- <CustomAction Id="DomainDefault" Property="JETTYD_DOMAIN" Value=""/>
- <CustomAction Id="ServiceUser" Property="SERVICE_USER" Value="[JETTYD_DOMAIN]\[JETTYD_USER]"/>
- <CustomAction Id="AceUserDomain" Property="ACE_USER" Value="[JETTYD_DOMAIN]\[PERMISSION_USER]"/>
- <CustomAction Id="AceUserNoDomain" Property="ACE_USER" Value="[PERMISSION_USER]"/>
-
- <InstallExecuteSequence>
- <Custom Action="PermissionUserSpecified" Before="DomainDefault">INSTALL_JETTYD_USER</Custom>
- <Custom Action="PermissionUserDefault" Before="DomainDefault">NOT INSTALL_JETTYD_USER</Custom>
- <Custom Action="DomainDefault" Before="AceUserDomain">NOT INSTALL_JETTYD_USER</Custom>
- <Custom Action="ServiceUser" After="DomainDefault">INSTALL_JETTYD_USER</Custom>
- <Custom Action="AceUserDomain" Before="AceUserNoDomain">JETTYD_DOMAIN</Custom>
- <Custom Action="AceUserNoDomain" Before="CreateFolders">NOT JETTYD_DOMAIN</Custom>
- </InstallExecuteSequence>
-
- <!-- Actions to set acls
- /t recursive
- /inheritance:r Remove inhetited ACLS
- /grant:r SYSTEM:F *add* Full access for SYSTEM (replacing any existing)
- [ACE_USER]:(GR,RD,X) *add* GENERIC_READ,READ_DATA,TRAVERSE access
- (Remember, when user not supplied ACE_USER is Administrators
- -->
- <CustomAction Id="SetIcaclsVerb" Property="IcaclsVerb" Value="/t /inheritance:r /grant SYSTEM:F Administrators:F"/>
- <CustomAction Id="SetACEConf" Property="QtSetACEConf"
- Value=""c:\Windows\System32\icacls.exe" "[IDP_INSTALLDIR]\conf" [IcaclsVerb] [ACE_USER]:(GR,RD,X)" />
- <CustomAction Id="QtSetACEConf" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
-
- <CustomAction Id="SetACECreds" Property="QtSetACECreds"
- Value=""c:\Windows\System32\icacls.exe" "[IDP_INSTALLDIR]\credentials" [IcaclsVerb] [ACE_USER]:(GR,RD,X)" />
- <CustomAction Id="QtSetACECreds" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
-
- <CustomAction Id="SetACELogs" Property="QtSetACELogs"
- Value=""c:\Windows\System32\icacls.exe" "[IDP_INSTALLDIR]\logs" [IcaclsVerb] [ACE_USER]:F" />
- <CustomAction Id="QtSetACELogs" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
-
- <CustomAction Id="SetACEJettyStart" Property="QtSetACEJettyStart"
- Value=""c:\Windows\System32\icacls.exe" "[IDP_INSTALLDIR]\jetty-base\start.d" [IcaclsVerb] [ACE_USER]:(GR,RD,X)" />
- <CustomAction Id="QtSetACEJettyStart" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
-
- <CustomAction Id="SetACEJettyTmp" Property="QtSetACEJettyTmp"
- Value=""c:\Windows\System32\icacls.exe" "[IDP_INSTALLDIR]\jetty-base\tmp" [IcaclsVerb] [ACE_USER]:F" />
- <CustomAction Id="QtSetACEJettyTmp" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
-
- <CustomAction Id="SetACEJettyLogs" Property="QtSetACEJettyLogs"
- Value=""c:\Windows\System32\icacls.exe" "[IDP_INSTALLDIR]\jetty-base\logs" [IcaclsVerb] [ACE_USER]:F" />
- <CustomAction Id="QtSetACEJettyLogs" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
-
- <CustomAction Id="SetACEProcrunLog" Property="QtSetACEProcrunLog"
- Value=""c:\Windows\System32\icacls.exe" "[SHIBBOLETHDIR]ProcRun\log" [IcaclsVerb] [ACE_USER]:F" />
- <CustomAction Id="QtSetACEProcrunLog" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
-
- <InstallExecuteSequence>
- <!-- Write the ACEs. IdP : conf, creds, logs -->
- <Custom Action="SetIcaclsVerb" Before="InstallFiles"/>
- <Custom Action="SetACEConf" After="SetIcaclsVerb"/>
- <Custom Action="QtSetACEConf" After="QtFinalizeJetty"/>
-
- <Custom Action="SetACECreds" After="SetIcaclsVerb"/>
- <Custom Action="QtSetACECreds" After="QtFinalizeJetty"/>
-
- <Custom Action="SetACELogs" After="SetIcaclsVerb"/>
- <Custom Action="QtSetACELogs" After="QtFinalizeJetty"/>
-
- <!-- Write the ACEs. jetty : start.d, tmp, logs -->
- <Custom Action="SetACEJettyStart" After="SetIcaclsVerb"/>
- <Custom Action="QtSetACEJettyStart" After="QtFinalizeJetty"/>
-
- <Custom Action="SetACEJettyTmp" After="SetIcaclsVerb"/>
- <Custom Action="QtSetACEJettyTmp" After="QtFinalizeJetty"/>
-
- <Custom Action="SetACEJettyLogs" After="SetIcaclsVerb"/>
- <Custom Action="QtSetACEJettyLogs" After="QtFinalizeJetty"/>
-
- <!-- Write the ACEs. Procrun: log -->
- <Custom Action="SetACEProcrunLog" After="SetIcaclsVerb"/>
- <Custom Action="QtSetACEProcrunLog" After="QtFinalizeJetty"/>
- </InstallExecuteSequence>
-
- </Fragment>
-</Wix>
diff --git a/idp-installer/src/main/wix/Jetty.bat b/idp-installer/src/main/wix/Jetty.bat
deleted file mode 100644
index d498b4471..000000000
--- a/idp-installer/src/main/wix/Jetty.bat
+++ /dev/null
@@ -1,154 +0,0 @@
- at Echo off
-REM Generate msm
-setlocal
-
-REM Preconditions
-
-if "%1%" == "" (
- Echo JETTY [APACHE_COMMON_ZIP] [JETTY_DISTRO_ZIP]
- goto done
-)
-if "%2%" == "" (
- Echo JETTY [APACHE_COMMON_ZIP] [JETTY_DISTRO_ZIP]
- goto done
-)
-
-if not defined WIX (
- echo WIX should be installed
- goto done
-)
-
-REM Clear up detritus from last time
-
-if exist jetty_contents.wxs (
- del jetty_contents.wxs
-)
-
-if exist procrun-extract (
- rd /q /s procrun-extract
-)
-
-if exist jetty-extract (
- rd /q /s jetty-extract
-)
-
-REM Set up environment
-
-if not defined JAVA_JDK (
- set JAVA_JDK=%JAVA_HOME%
-)
-
-if not defined JAVA_JDK (
- echo Error: Nether JAVA_JDK nor JAVA_HOME is defined.
- exit /b
-)
-
-if not defined JARCMD (
- set JARCMD=%JAVA_JDK%\bin\jar.exe
-)
-
-if not exist "%JARCMD%" (
- echo Error: JAVA_HOME is not defined correctly.
- echo Cannot execute %JARCMD%
- exit /b
-)
-
-REM Test and extract
-
-if not exist "%1%" (
- echo Error: Could not locate procrun zip %1%
- goto done
-)
-
-if not exist %1.asc (
- echo Error: Could not locate signature for procrun zip %1%.asc
- goto done
-)
-
-gpg --verify %1.asc %1
-if ERRORLEVEL 1 (
- echo Error: Signature check failed on %1%
- goto done
-)
-
-mkdir procrun-extract
-cd procrun-extract
-if exist "%1" (
- "%JARCMD%" xf %1
-) else (
- "%JARCMD%" xf ..\%1
-)
-cd ..
-
-if not exist procrun-extract\prunsrv.exe (
- echo could not find prunsrv, is %1% really a procrun source?
- goto done
-)
-
-if not exist "%2" (
- echo Error: Could not locate Jetty zip %2%
- goto done
-)
-
-if not exist "%2".asc (
- echo Error: Could not locate signature for jetty zip %2%.asc
- goto done
-)
-
-gpg --verify %2.asc %2
-if ERRORLEVEL 1 (
- echo Error: Signature check failed on %2%
- goto done
-)
-
-mkdir jetty-extract
-cd jetty-extract
-
-if exist "%2" (
- "%JARCMD%" xf %2
-) else (
- "%JARCMD%" xf ..\%2
-)
-dir /s jetty-ssl-context.xml 1> nl:a 2> nl:b
-if ERRORLEVEL 1 (
- cd ..
- echo "Could not find jsp.ini in Jetty package"
- goto done;
-)
-cd ..
-
-REM Extract Jetty
-REM IDP-1193 - and kill off demo-base
-
-for /D %%X in (jetty-extract/*) do set jex=%%X
-rd /s /q jetty-extract\%jex%\demo-base
-echo %jex% 1> jetty-extract/%jex%/JETTY_VERSION.TXT
-"%WIX%/BIN/HEAT" dir jetty-extract\%Jex% -platform -gg -dr JETTYROOT -var var.JettySrc -cg JettyGroup -out jetty_contents.wxs -nologo -srd
-if ERRORLEVEL 1 goto done
-
-REM TODO extract the Main-Class (via Properties) from start.jar
-set JETTY_CLASS=org.eclipse.jetty.start.Main
-
-Rem tidy
-del *.wixobj *.wixpdb
-
-REM compile Jetty and procrun contents as well as the merge module for x64
-
-"%WIX%/BIN/CANDLE" -nologo -dJettySrc=jetty-extract\%Jex% -dJettyClass=%JETTY_CLASS% -dProcrunSrc=procrun-extract -dPlatform=x86 -arch x86 jetty_contents.wxs MergeModule.wxs procrun.wxs -ext WixFirewallExtension -ext WixUtilExtension
-if ERRORLEVEL 1 goto done
-
-REM link for x64
-
-"%WIX%/BIN/LIGHT" -nologo -out Jetty-x64.msm jetty_contents.wixobj procrun.wixobj mergemodule.wixobj -ext WixFirewallExtension -sw1072 -ext WixUtilExtension
-if ERRORLEVEL 1 goto done
-
-dir Jetty-*.msm
-
-REM Tidy up in the Sucessful exit case
- rd /q /s procrun-extract
- rd /q /s jetty-extract
- del *.wixobj *.wixpdb
- del jetty_contents.wxs
-
-:done
-
diff --git a/idp-installer/src/main/wix/Jetty.wixproj b/idp-installer/src/main/wix/Jetty.wixproj
deleted file mode 100644
index b1a738ef0..000000000
--- a/idp-installer/src/main/wix/Jetty.wixproj
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
- <ProductVersion>3.8</ProductVersion>
- <ProjectGuid>b9fe96c0-3667-4af8-b1bf-adabe24fc8bb</ProjectGuid>
- <SchemaVersion>2.0</SchemaVersion>
- <OutputName>Jetty</OutputName>
- <OutputType>Module</OutputType>
- <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
- <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
- <Name>Jetty</Name>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
- <OutputPath>.\</OutputPath>
- <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
- <DefineConstants>Debug;jettySrc=jetty-extract\jetty-distribution-9.2.2.v20140723</DefineConstants>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
- <OutputPath>bin\$(Configuration)\</OutputPath>
- <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
- </PropertyGroup>
- <ItemGroup>
- <Compile Include="jetty_contents.wxs" />
- <Compile Include="MergeModule.wxs" />
- <Compile Include="procrun.wxs" />
- </ItemGroup>
- <Import Project="$(WixTargetsPath)" />
- <!--
- To modify your build process, add your task inside one of the targets below and uncomment it.
- Other similar extension points exist, see Wix.targets.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- -->
-</Project>
\ No newline at end of file
diff --git a/idp-installer/src/main/wix/JettyNew.bat b/idp-installer/src/main/wix/JettyNew.bat
deleted file mode 100644
index 87947e381..000000000
--- a/idp-installer/src/main/wix/JettyNew.bat
+++ /dev/null
@@ -1,212 +0,0 @@
- at Echo off
-REM Generate msm
-setlocal
-
-REM Preconditions
-
-if "%1%" == "" (
- Echo JETTY [APACHE_COMMON_ZIP] [JETTY_DISTRO_ZIP] [JETTY_BASE_ZIP]
- goto done
-)
-if "%2%" == "" (
- Echo JETTY [APACHE_COMMON_ZIP] [JETTY_DISTRO_ZIP] [JETTY_BASE_ZIP]
- goto done
-)
-if "%3%" == "" (
- Echo JETTY [APACHE_COMMON_ZIP] [JETTY_DISTRO_ZIP] [JETTY_BASE_ZIP]
- goto done
-)
-
-if not defined WIX (
- echo WIX should be installed
- goto done
-)
-
-REM Clear up detritus from last time
-
-if exist jetty_contents.wxs (
- del jetty_contents.wxs
-)
-
-if exist jetty_base_contents.wxs (
- del jetty_base_contents.wxs
-)
-
-if exist idp-jetty-base-extract (
- rd /q /s idp-jetty-base-extract
-)
-
-if exist procrun-extract (
- rd /q /s procrun-extract
-)
-
-if exist jetty-extract (
- rd /q /s jetty-extract
-)
-
-REM Set up environment
-
-if not defined JAVA_JDK (
- set JAVA_JDK=%JAVA_HOME%
-)
-
-if not defined JAVA_JDK (
- echo Error: Nether JAVA_JDK nor JAVA_HOME is defined.
- exit /b
-)
-
-if not defined JARCMD (
- set JARCMD=%JAVA_JDK%\bin\jar.exe
-)
-
-if not exist "%JARCMD%" (
- echo Error: JAVA_HOME is not defined correctly.
- echo Cannot execute %JARCMD%
- exit /b
-)
-
-REM Test and extract
-
-if not exist "%1%" (
- echo Error: Could not locate procrun zip %1%
- goto done
-)
-
-if not exist %1.asc (
- echo Error: Could not locate signature for procrun zip %1%.asc
- goto done
-)
-
-gpg --verify %1.asc %1
-if ERRORLEVEL 1 (
- echo Error: Signature check failed on %1%
- goto done
-)
-
-mkdir procrun-extract
-cd procrun-extract
-"%JARCMD%" xf ..\%1
-cd ..
-
-if not exist procrun-extract\prunsrv.exe (
- echo could not find prunsrv, is %1% really a procrun source?
- goto done
-)
-
-if not exist "%2" (
- echo Error: Could not locate Jetty zip %2%
- goto done
-)
-
-if not exist "%2".asc (
- echo Error: Could not locate signature for jetty zip %2%.asc
- goto done
-)
-
-gpg --verify %2.asc %2
-if ERRORLEVEL 1 (
- echo Error: Signature check failed on %2%
- goto done
-)
-
-REM Now do the same again for jetty-base
-if not exist %3% (
- echo Error: Could not locate jetty base zip %2%
- goto done
-)
-
-if not exist %3.asc (
- echo Error: Could not locate signature for jetty base zip %3%.asc
- goto noJettyBaseSig
-)
-
-gpg --verify %3.asc %3
-if ERRORLEVEL 1 (
- echo Error: Signature check failed on %3%
- goto done
-)
-:noJettyBaseSig
-mkdir idp-jetty-base-extract
-cd idp-jetty-base-extract
-"%JARCMD%" xf ..\%3
-
-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 jetty-base
-
-rem organize the jetty base for extraction
-
-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 & log dir
-mkdir tmp
-echo "keeper" > tmp\.keep
-mkdir log
-echo "keeper" > log\.log
-
-cd ..\..
-"%WIX%/BIN/HEAT" dir idp-jetty-base-extract\jetty-base -platform -gg -dr IDP_INSTALLDIR -var var.jettyBaseRoot -cg JettyBaseGroup -out jetty_base_contents.wxs -src
-if ERRORLEVEL 1 goto done
-
-mkdir jetty-extract
-cd jetty-extract
-"%JARCMD%" xf ..\%2
-
-dir /s jetty-ssl-context.xml 1> nl:a 2> nl:b
-if ERRORLEVEL 1 (
- cd ..
- echo "Could not find jsp.ini in Jetty package"
- goto done;
-)
-cd ..
-
-REM IDP-1193 - and kill off demo-base
-
-for /D %%X in (jetty-extract/*) do set jex=%%X
-rd /s /q jetty-extract\%jex%\demo-base
-
-REM Extract Jetty
-echo %jex% 1> jetty-extract/%jex%/JETTY_VERSION.TXT
-"%WIX%/BIN/HEAT" dir jetty-extract\%Jex% -platform -gg -dr JETTYROOT -var var.JettySrc -cg JettyGroup -out jetty_contents.wxs -nologo -srd
-if ERRORLEVEL 1 goto done
-
-Rem tidy
-del *.wixobj *.wixpdb
-
-:recompile
-REM compile Jetty and procrun contents as well as the main command line
-
-"%WIX%/BIN/CANDLE" -nologo -dJettySrc=jetty-extract\%Jex% -dProcrunSrc=procrun-extract -dPlatform=x86 -arch x86 jetty_contents.wxs Jetty-main.wxs Jetty-Procrun.wxs -ext WixFirewallExtension -ext WixUtilExtension
-if ERRORLEVEL 1 goto done
-
-"%WIX%/BIN/CANDLE" -nologo -arch x86 -djettyBaseRoot=idp-jetty-base-extract\jetty-base -dProjectDir=. jetty_base_contents.wxs Jetty-User.wxs jetty-delete.wxs Jetty-Gui.wxs Jetty-InstallDlg.wxs -ext WixUtilExtension
-if ERRORLEVEL 1 goto done
-
-
-REM link for x64
-
-"%WIX%/BIN/LIGHT" -nologo -out Jetty-x64.msi jetty_base_contents.wixobj jetty_contents.wixobj Jetty-Procrun.wixobj Jetty-main.wixobj jetty-delete.wixobj Jetty-User.wixobj Jetty-Gui.wixobj Jetty-InstallDlg.wixobj -ext WixFirewallExtension -sw1072 -ext WixUtilExtension -sice:ICE61 -ext WixUIExtension
-if ERRORLEVEL 1 goto done
-
-dir Jetty-*.msi
-
-REM Tidy up in the Sucessful exit case
- rd /q /s procrun-extract
- rd /q /s jetty-extract
- rd /q /s idp-jetty-base-extract
- del *.wixobj *.wixpdb
- del jetty_contents.wxs
- del jetty_base_contents.wxs
-:done
-
diff --git a/idp-installer/src/main/wix/MergeModule.wxs b/idp-installer/src/main/wix/MergeModule.wxs
deleted file mode 100644
index 37bd5a2d3..000000000
--- a/idp-installer/src/main/wix/MergeModule.wxs
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the University Corporation for Advanced Internet
- Development, Inc. (UCAID) under one or more contributor license
- agreements. See the NOTICE file distributed with this work for
- additional information regarding copyright ownership. The UCAID
- licenses this file to You 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">
- <Module Id="Jetty" Language="1033" Version="5.0.0.0">
- <Package Id="684b3207-0d64-43e6-9e6a-3acb8b7672d7" Manufacturer="The Shibboleth Consortium" InstallerVersion="310" Description="Merge Module for Jetty" Comments="This module is built by the Shibboleth Consortium. Includes Jetty (from Eclipse) and Procrun (from Apache)" Platform="x64" />
- <Directory Id="TARGETDIR" Name="SourceDir">
- <Component Id="SaveTarget" Guid="{B5B909A2-E246-4069-808D-7F3AC98D062B}" 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" />
- </Component>
- <Directory Id="JETTYROOT" Name="Jetty" />
- <Directory Id="PROCRUNROOT" Name="ProcRun" />
- </Directory>
-
- <CustomAction Id="InheritJettydUser" Property="JETTYD_USER" Value="[OLD_JETTYD_USER]" />
- <CustomAction Id="InheritJettydDomain" Property="JETTYD_DOMAIN" Value="[OLD_JETTYD_DOMAIN]" />
- <CustomAction Id="SetJettydDomain" Property="JETTYD_DOMAIN" Value="[%USERDOMAIN]" />
- <CustomAction Id="InheritInstallJettydUser" Property="INSTALL_JETTYD_USER" Value="[OLD_INSTALL_JETTYD_USER]" />
- <CustomAction Id="SetInstallJettydUser" Property="INSTALL_JETTYD_USER" Value="TRUE" />
-
- <InstallUISequence>
- <!-- inherit JettydUser stuff-->
- <Custom Action="InheritJettydUser" After="AppSearch">OLD_JETTYD_USER AND NOT JETTYD_USER</Custom>
- <Custom Action="InheritJettydDomain" After="AppSearch">OLD_JETTYD_DOMAIN AND NOT JETTYD_DOMAIN</Custom>
- <Custom Action="SetJettydDomain" After="AppSearch">NOT OLD_JETTYD_DOMAIN AND NOT JETTYD_DOMAIN</Custom>
- <Custom Action="InheritInstallJettydUser" After="AppSearch">OLD_INSTALL_JETTYD_USER AND NOT JETTYD_USER</Custom>
- <Custom Action="SetInstallJettydUser" After="AppSearch">JETTYD_USER</Custom>
- </InstallUISequence>
-
- <CustomAction Id="UserSpecified" Property="PERMISSION_USER" Value="[JETTYD_USER]"/>
- <CustomAction Id="UserDefault" Property="PERMISSION_USER" Value="Administrators"/>
- <CustomAction Id="DomainDefault" Property="JETTYD_DOMAIN" Value=""/>
- <CustomAction Id="ServiceUser" Property="SERVICE_USER" Value="[JETTYD_DOMAIN]\[JETTYD_USER]"/>
-
- <InstallExecuteSequence>
- <Custom Action="UserSpecified" Before="CreateFolders">INSTALL_JETTYD_USER</Custom>
- <Custom Action="UserDefault" Before="CreateFolders">NOT INSTALL_JETTYD_USER</Custom>
- <Custom Action="DomainDefault" Before="CreateFolders">NOT INSTALL_JETTYD_USER</Custom>
- <Custom Action="ServiceUser" Before="InstallServices">INSTALL_JETTYD_USER</Custom>
- </InstallExecuteSequence>
-
- <ComponentGroupRef Id="JettyGroup" />
- <ComponentGroupRef Id="ProcrunGroup" />
- </Module>
-</Wix>
diff --git a/idp-installer/src/main/wix/scripts/jetty_script.vbs b/idp-installer/src/main/wix/scripts/jetty_script.vbs
deleted file mode 100644
index f76454cc3..000000000
--- a/idp-installer/src/main/wix/scripts/jetty_script.vbs
+++ /dev/null
@@ -1,14 +0,0 @@
-' c:\program file\foo\bar/idp/ -> c:/program file/foo/bar/idp
-newHome = Replace(Session.Property("IDP_INSTALLDIR"), "\", "/")
-if (Right(newHome, 1) = "/") then
- Session.Property("JAVA_IDP_HOME") = Left(newHome, Len(newHome) -1)
-else
- Session.Property("JAVA_IDP_HOME") = newHome
-end if
-
-' create the jetty password while we are at it
-
-Set TypeLib = CreateObject("Scriptlet.TypeLib")
-JettyPassword=left(TypeLib.Guid, 38)
-' Prefix the property with the MM GUID....
-Session.Property("JETTY_PASS") = JettyPassword
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list