[java-identity-provider] 01/01: IDP-2136 WIP
Rod Widdowson
rdw at steadingsoftware.com
Wed Jul 19 14:30:15 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=9b1e438c3b7c45aad38c5adef9d81369a1a42509
commit 9b1e438c3b7c45aad38c5adef9d81369a1a42509
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Jul 19 15:29:57 2023 +0100
IDP-2136 WIP
---
idp-installer/src/main/wix/.gitignore | 4 +
.../{ShibbolethIdP-delete.wxs => Jetty-delete.wxs} | 44 ++---
idp-installer/src/main/wix/Jetty-main.wxs | 105 +++++++++++
idp-installer/src/main/wix/JettyNew.bat | 210 +++++++++++++++++++++
.../src/main/wix/ShibbolethIdP-delete.wxs | 44 +----
idp-installer/src/main/wix/ShibbolethIdP-main.wxs | 11 +-
.../src/main/wix/ShibbolethIdP-registry.wxs | 44 -----
idp-installer/src/main/wix/procrun.wxs | 62 +++---
.../src/main/wix/scripts/jetty_script.vbs | 14 ++
idp-installer/src/main/wix/scripts/shib_random.vbs | 8 -
.../main/wix/scripts/shib_set_java_idp_home.vbs | 7 -
11 files changed, 385 insertions(+), 168 deletions(-)
diff --git a/idp-installer/src/main/wix/.gitignore b/idp-installer/src/main/wix/.gitignore
index 0871ecf98..13e3f189d 100644
--- a/idp-installer/src/main/wix/.gitignore
+++ b/idp-installer/src/main/wix/.gitignore
@@ -1,4 +1,8 @@
/*.msi
/*.msm
/*.suo
+*.zip
+*.zip.asc
+*.wixobj
+*.wixpdb
/bin
diff --git a/idp-installer/src/main/wix/ShibbolethIdP-delete.wxs b/idp-installer/src/main/wix/Jetty-delete.wxs
similarity index 61%
copy from idp-installer/src/main/wix/ShibbolethIdP-delete.wxs
copy to idp-installer/src/main/wix/Jetty-delete.wxs
index 91c83b8fd..8031c92cd 100644
--- a/idp-installer/src/main/wix/ShibbolethIdP-delete.wxs
+++ b/idp-installer/src/main/wix/Jetty-delete.wxs
@@ -19,36 +19,22 @@
<!-- 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="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>
-
- <Component Id="RemoveOldJettyBaseEtc" Guid="{D98798EB-445C-425B-BBAA-9992F04B67EC}" Win64="no" Directory="INSTALLDIR">
+ <Component Id="RemoveOldJettyBaseEtc" Guid="{D98798EB-445C-425B-BBAA-9992F04B67EC}" 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" />
</Component>
- <Component Id="RemoveOldJettyBaseLib" Guid="{7360D58D-30CD-4782-A8F5-66275C4FA15B}" Win64="no" Directory="INSTALLDIR">
+ <Component Id="RemoveOldJettyBaseLib" Guid="{7360D58D-30CD-4782-A8F5-66275C4FA15B}" Win64="no" Directory="IDP_INSTALLDIR">
<RegistryValue Id="RemoveOldJettyBaseLib" Root="HKLM" Key="SOFTWARE\Shibboleth\IdP" Name="RemoveOldJettyBaseLib" Value="TRUE" Type="string" KeyPath="yes" />
<util:RemoveFolderEx On="install" Property="OldJettyBaseLib" />
</Component>
- <Component Id="RemoveOldJettyBaseResources" Guid="{19AE423B-7F36-491A-9FE8-C0B1216E3EF5}" Win64="no" Directory="INSTALLDIR">
+ <Component Id="RemoveOldJettyBaseResources" Guid="{19AE423B-7F36-491A-9FE8-C0B1216E3EF5}" Win64="no" Directory="IDP_INSTALLDIR">
<RegistryValue Id="RemoveJettyBaseResources" Root="HKLM" Key="SOFTWARE\Shibboleth\IdP" Name="RemoveOldJettyBaseResources" Value="TRUE" Type="string" KeyPath="yes" />
<util:RemoveFolderEx On="install" Property="OldJettyBaseResources" />
</Component>
- <Component Id="RemoveOldJettyBaseWebapps" Guid="{CE03E32C-D5B2-46E6-B337-40CF206A997F}" Win64="no" Directory="INSTALLDIR">
+ <Component Id="RemoveOldJettyBaseWebapps" Guid="{CE03E32C-D5B2-46E6-B337-40CF206A997F}" Win64="no" Directory="IDP_INSTALLDIR">
<RegistryValue Id="RemoveOldJettyBaseWebapps" Root="HKLM" Key="SOFTWARE\Shibboleth\IdP" Name="RemoveOldJettyBaseWebapps" Value="TRUE" Type="string" KeyPath="yes" />
<util:RemoveFolderEx On="install" Property="OldJettyBaseWebapps" />
</Component>
@@ -64,24 +50,18 @@
</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" />
- <CustomAction Id="SetOldJettyBaseEtc" Property="OldJettyBaseEtc" Value="[INSTALLDIR]\jetty-base\etc" />
- <CustomAction Id="SetOldJettyBaseLib" Property="OldJettyBaseLib" Value="[INSTALLDIR]\jetty-base\lib" />
- <CustomAction Id="SetOldJettyBaseResources" Property="OldJettyBaseResources" Value="[INSTALLDIR]\jetty-base\resources" />
- <CustomAction Id="SetOldJettyBaseWebapps" Property="OldJettyBaseWebapps" Value="[INSTALLDIR]\jetty-base\webapps" />
+ <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="SetProcRunDir" Property="ProcRunDir" Value="[SHIBBOLETHDIR]\ProcRun" />
<CustomAction Id="SetJettyDir" Property="JettyDir" Value="[SHIBBOLETHDIR]\Jetty" />
<InstallExecuteSequence>
- <Custom Action="SetOldSystem" After="InheritInstallJetty" />
- <Custom Action="SetOldWebApp" After="InheritInstallJetty" />
- <Custom Action="SetOldBinLib" After="InheritInstallJetty" />
- <Custom Action="SetOldJettyBaseEtc" After="InheritInstallJetty" />
- <Custom Action="SetOldJettyBaseLib" After="InheritInstallJetty" />
- <Custom Action="SetOldJettyBaseResources" After="InheritInstallJetty" />
- <Custom Action="SetOldJettyBaseWebapps" After="InheritInstallJetty" />
+ <Custom Action="SetOldJettyBaseEtc" After="AppSearch" />
+ <Custom Action="SetOldJettyBaseLib" After="AppSearch" />
+ <Custom Action="SetOldJettyBaseResources" After="AppSearch" />
+ <Custom Action="SetOldJettyBaseWebapps" After="AppSearch" />
<Custom Action="SetProcRunDir" After="AppSearch" />
<Custom Action="SetJettyDir" After="AppSearch" />
</InstallExecuteSequence>
diff --git a/idp-installer/src/main/wix/Jetty-main.wxs b/idp-installer/src/main/wix/Jetty-main.wxs
new file mode 100644
index 000000000..ba687fb7c
--- /dev/null
+++ b/idp-installer/src/main/wix/Jetty-main.wxs
@@ -0,0 +1,105 @@
+<?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="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="SaveRegistry" />
+ <ComponentRef Id="Shibd_idpw" /> -->
+ </Feature>
+
+ <Directory Id="TARGETDIR" Name="SourceDir">
+ <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>
+
+ <!-- Parameters -->
+ <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>
+
+ <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>
+
+ <Upgrade Id="$(var.UpgradeUUID)">
+ <UpgradeVersion ExcludeLanguages="yes" IncludeMaximum="yes" Maximum="127.255.255" Minimum="0.0.1" OnlyDetect="yes" Property="ALREADYINSTALLED" />
+ </Upgrade>
+
+ </Product>
+</Wix>
diff --git a/idp-installer/src/main/wix/JettyNew.bat b/idp-installer/src/main/wix/JettyNew.bat
new file mode 100644
index 000000000..f288efdf4
--- /dev/null
+++ b/idp-installer/src/main/wix/JettyNew.bat
@@ -0,0 +1,210 @@
+REM @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 dir
+mkdir tmp
+echo "keeper" > tmp\.keep
+
+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 procrun.wxs -ext WixFirewallExtension -ext WixUtilExtension
+if ERRORLEVEL 1 goto done
+
+"%WIX%/BIN/CANDLE" -nologo -arch x86 -djettyBaseRoot=idp-jetty-base-extract\jetty-base jetty_base_contents.wxs jetty-delete.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 procrun.wixobj Jetty-main.wixobj jetty-delete.wixobj -ext WixFirewallExtension -sw1072 -ext WixUtilExtension -sice:ICE61
+if ERRORLEVEL 1 goto done
+
+goto done
+dir Jetty-*.msi
+
+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
+ del jetty_base_contents.wxs
+:done
+
diff --git a/idp-installer/src/main/wix/ShibbolethIdP-delete.wxs b/idp-installer/src/main/wix/ShibbolethIdP-delete.wxs
index 91c83b8fd..c798ac81a 100644
--- a/idp-installer/src/main/wix/ShibbolethIdP-delete.wxs
+++ b/idp-installer/src/main/wix/ShibbolethIdP-delete.wxs
@@ -33,57 +33,15 @@
<util:RemoveFolderEx On="install" Property="OldBinLib" />
</Component>
- <Component Id="RemoveOldJettyBaseEtc" Guid="{D98798EB-445C-425B-BBAA-9992F04B67EC}" Win64="no" Directory="INSTALLDIR">
- <RegistryValue Id="RemoveOldJettyBaseEtc" Root="HKLM" Key="SOFTWARE\Shibboleth\IdP" Name="RemoveOldJettyBaseEtc" Value="TRUE" Type="string" KeyPath="yes" />
- <util:RemoveFolderEx On="install" Property="OldJettyBaseEtc" />
- </Component>
-
- <Component Id="RemoveOldJettyBaseLib" Guid="{7360D58D-30CD-4782-A8F5-66275C4FA15B}" Win64="no" Directory="INSTALLDIR">
- <RegistryValue Id="RemoveOldJettyBaseLib" Root="HKLM" Key="SOFTWARE\Shibboleth\IdP" Name="RemoveOldJettyBaseLib" Value="TRUE" Type="string" KeyPath="yes" />
- <util:RemoveFolderEx On="install" Property="OldJettyBaseLib" />
- </Component>
-
- <Component Id="RemoveOldJettyBaseResources" Guid="{19AE423B-7F36-491A-9FE8-C0B1216E3EF5}" Win64="no" Directory="INSTALLDIR">
- <RegistryValue Id="RemoveJettyBaseResources" Root="HKLM" Key="SOFTWARE\Shibboleth\IdP" Name="RemoveOldJettyBaseResources" Value="TRUE" Type="string" KeyPath="yes" />
- <util:RemoveFolderEx On="install" Property="OldJettyBaseResources" />
- </Component>
-
- <Component Id="RemoveOldJettyBaseWebapps" Guid="{CE03E32C-D5B2-46E6-B337-40CF206A997F}" Win64="no" Directory="INSTALLDIR">
- <RegistryValue Id="RemoveOldJettyBaseWebapps" Root="HKLM" Key="SOFTWARE\Shibboleth\IdP" Name="RemoveOldJettyBaseWebapps" Value="TRUE" Type="string" KeyPath="yes" />
- <util:RemoveFolderEx On="install" Property="OldJettyBaseWebapps" />
- </Component>
-
- <Component Id="RemoveJettyDir" Guid="{557F0D43-F730-4912-BFE6-1905E69644A8}" 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">
- <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="SetOldSystem" Property="OldSystem" Value="[INSTALLDIR]\System" />
<CustomAction Id="SetOldWebApp" Property="OldWebAPP" Value="[INSTALLDIR]\WebApp" />
<CustomAction Id="SetOldBinLib" Property="OldBinLib" Value="[INSTALLDIR]\bin\lib" />
- <CustomAction Id="SetOldJettyBaseEtc" Property="OldJettyBaseEtc" Value="[INSTALLDIR]\jetty-base\etc" />
- <CustomAction Id="SetOldJettyBaseLib" Property="OldJettyBaseLib" Value="[INSTALLDIR]\jetty-base\lib" />
- <CustomAction Id="SetOldJettyBaseResources" Property="OldJettyBaseResources" Value="[INSTALLDIR]\jetty-base\resources" />
- <CustomAction Id="SetOldJettyBaseWebapps" Property="OldJettyBaseWebapps" Value="[INSTALLDIR]\jetty-base\webapps" />
- <CustomAction Id="SetProcRunDir" Property="ProcRunDir" Value="[SHIBBOLETHDIR]\ProcRun" />
- <CustomAction Id="SetJettyDir" Property="JettyDir" Value="[SHIBBOLETHDIR]\Jetty" />
- <InstallExecuteSequence>
+ <InstallExecuteSequence>
<Custom Action="SetOldSystem" After="InheritInstallJetty" />
<Custom Action="SetOldWebApp" After="InheritInstallJetty" />
<Custom Action="SetOldBinLib" After="InheritInstallJetty" />
- <Custom Action="SetOldJettyBaseEtc" After="InheritInstallJetty" />
- <Custom Action="SetOldJettyBaseLib" After="InheritInstallJetty" />
- <Custom Action="SetOldJettyBaseResources" After="InheritInstallJetty" />
- <Custom Action="SetOldJettyBaseWebapps" After="InheritInstallJetty" />
- <Custom Action="SetProcRunDir" After="AppSearch" />
- <Custom Action="SetJettyDir" After="AppSearch" />
</InstallExecuteSequence>
</Fragment>
diff --git a/idp-installer/src/main/wix/ShibbolethIdP-main.wxs b/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
index 76ffc51bc..1cdcc5dcc 100644
--- a/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
+++ b/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
@@ -72,7 +72,7 @@
</Component>
</Directory>
<Component Id="IdPPermissions" Guid="{5672474B-3CD2-44EB-9942-871844A2B089}" Win64="no">
- <RegistryValue Id="SetPermissions" Root="HKLM" Key="SOFTWARE\Shibboleth\IdP" Name="SetPermissions" Value="TRUE" Type="string" KeyPath="yes" />
+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" />
@@ -147,10 +147,8 @@
<CustomAction Id="SetDNSName" Property="DNSNAME" Value="[ComputerName]" />
<Binary Id="WriteConfigFilesSrc" SourceFile="scripts\shib_write_configs.vbs" />
- <Binary Id="SetJavaIdpHomeSrc" SourceFile="scripts\shib_set_java_idp_home.vbs" />
<CustomAction Id="WriteConfigFiles" BinaryKey="WriteConfigFilesSrc" VBScriptCall="" Execute="deferred" Impersonate="no" />
- <CustomAction Id="SetJavaIdpHome" BinaryKey="SetJavaIdpHomeSrc" VBScriptCall="" Execute="immediate" />
<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="SetDefaultInstallDir" Property="DefaultInstallDir" Value="[WindowsVolume]opt\shibboleth-idp\" />
@@ -166,7 +164,6 @@
<CustomAction Id="RunFinalizeJetty" Directory="INSTALLDIR" ExeCommand="[QtFinalizeJetty]" Execute="deferred" Impersonate="no" />
<CustomAction Id="QtFinalizeJetty" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
- <CustomAction Id="SetJavaJvmMx" Property="JAVA_JVMMX" Value="#2048" />
<!-- 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]" />
@@ -239,14 +236,8 @@
<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>
- <!-- Setup JAVA_IDP_HOME before we use it -->
-
- <Custom Action="SetJavaIdpHome" Before="SetIdpInstall1" />
-
<!-- Could we find JAVA.EXE ?-->
<Custom Action="NoJavaBin" After="AppSearch">NOT JAVA_EXECUTABLE</Custom>
- <!-- Preserve Jetty parms -->
- <Custom Action="SetJavaJvmMx" After="AppSearch">(NOT Installed) AND INSTALL_JETTY AND (NOT JAVA_JVMMX)</Custom>
<!-- Work -->
diff --git a/idp-installer/src/main/wix/ShibbolethIdP-registry.wxs b/idp-installer/src/main/wix/ShibbolethIdP-registry.wxs
index 0ce2a30bf..abedba793 100644
--- a/idp-installer/src/main/wix/ShibbolethIdP-registry.wxs
+++ b/idp-installer/src/main/wix/ShibbolethIdP-registry.wxs
@@ -32,50 +32,6 @@
<File KeyPath="yes" Source="$(var.ProjectDir)\shib.ico" />
<RegistryValue Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductCode]" Name="DisplayIcon" Value="[#shib.ico],0" Type="string" />
</Component>
- <!-- Jetty Configuration-->
- <Component Id="JettyConfig" Directory="INSTALLDIR" Guid="{FE729EF2-8293-493A-80C9-69CF54DC4565}" KeyPath="yes" Win64="no">
- <RegistryKey ForceDeleteOnUninstall="yes" ForceCreateOnInstall="yes" Key="SOFTWARE\Apache Software Foundation\Procrun 2.0\$(var.ServiceName)\Parameters" Root="HKLM">
- <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]" GenericRead="yes" GenericExecute="yes" Read="yes" />
- </RegistryKey>
-
- <RegistryKey ForceDeleteOnUninstall="yes" ForceCreateOnInstall="yes" Key="SOFTWARE\Apache Software Foundation\Procrun 2.0\$(var.ServiceName)\Parameters\Java" Root="HKLM">
- <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.684B3207_0D64_43E6_9E6A_3ACB8B7672D7]" User="[PERMISSION_USER.684B3207_0D64_43E6_9E6A_3ACB8B7672D7]" GenericRead="yes" GenericExecute="yes" Read="yes" />
- </RegistryKey>
- <RegistryKey ForceDeleteOnUninstall="yes" ForceCreateOnInstall="yes" Key="SOFTWARE\Apache Software Foundation\Procrun 2.0\$(var.ServiceName)\Parameters\Start" Root="HKLM" >
- <RegistryValue Name="Params" Type="multiString" Action="append">
- <MultiStringValue>jetty.base=[INSTALLDIR]\jetty-base</MultiStringValue>
- <MultiStringValue>jetty.logging.dir=[INSTALLDIR]\jetty-base\logs</MultiStringValue>
- </RegistryValue>
- <RegistryValue Name="WorkingPath" Type="string" Value="[INSTALLDIR]\jetty-base\"/>
- <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]" GenericRead="yes" GenericExecute="yes" Read="yes" />
- </RegistryKey>
- <RegistryKey ForceDeleteOnUninstall="yes" ForceCreateOnInstall="yes" Key="SOFTWARE\Apache Software Foundation\Procrun 2.0\$(var.ServiceName)\Parameters\Stop" Root="HKLM" >
- <RegistryValue Name="Params" Type="multiString" Action="append">
- <MultiStringValue>jetty.base=[INSTALLDIR]\jetty-base</MultiStringValue>
- <MultiStringValue>jetty.logging.dir=[INSTALLDIR]\jetty-base\logs</MultiStringValue>
- </RegistryValue>
- <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]" GenericRead="yes" GenericExecute="yes" Read="yes" />
- </RegistryKey>
- <Condition>INSTALL_JETTY</Condition>
- </Component>
</ComponentGroup>
<Property Id="OLD_INSTALLDIR" Secure="yes">
diff --git a/idp-installer/src/main/wix/procrun.wxs b/idp-installer/src/main/wix/procrun.wxs
index d93dd7896..a5670bd4d 100644
--- a/idp-installer/src/main/wix/procrun.wxs
+++ b/idp-installer/src/main/wix/procrun.wxs
@@ -23,13 +23,6 @@
<Directory Id="dir64" Name="amd64" />
<Directory Id="procrunLogFolder" Name="log" />
</DirectoryRef>
- <Binary Id="DoRandomSrc" SourceFile="scripts\shib_random.vbs" />
- <CustomAction Id="MakeRandom" BinaryKey="DoRandomSrc" VBScriptCall="" Execute="immediate" />
- <InstallExecuteSequence>
- <!-- Do/Do Not not start service -->
- <StartServices>(ALWAYS_START_SERVICE = "TRUE")</StartServices>
- <Custom Action="MakeRandom" Before="WriteRegistryValues">NOT Installed</Custom>
- </InstallExecuteSequence>
</Fragment>
<Fragment>
<ComponentGroup Id="ProcrunGroup">
@@ -60,15 +53,7 @@
<!-- Install the service. -->
- <Component Id="procrun_32_service" Directory="PROCRUNROOT" Guid="{544A5D33-CF99-4384-A74D-79FB29DE904D}">
- <File Id="file_procrun_32_service" KeyPath="yes" Source="$(var.ProcrunSrc)\prunsrv.exe" Name="$(var.ServiceName).exe" />
- </Component>
- <Component Id="procrun_32_Firewall" Directory="PROCRUNROOT" Guid="{F93B8D9F-7BBA-4D79-995D-4AC20FF158E4}" KeyPath="yes">
- <Condition>Not NO_FIREWALL</Condition>
- <fw:FirewallException Id="Win32Shibd_idp" Program="[#file_procrun_32_service]" Name="Win32Shibd_idp" Description="The Shibboleth IdP" Protocol="tcp" Scope="any" />
- </Component>
-
- <Component Id="procrun_AMD64_service" Directory="dir64" Guid="{2673BCBE-3659-4AC6-B39C-DF1EEDF72C0E}">
+ <Component Id="procrun_service" Directory="dir64" Guid="{2673BCBE-3659-4AC6-B39C-DF1EEDF72C0E}">
<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"
@@ -77,7 +62,7 @@
<util:ServiceConfig FirstFailureActionType="none" SecondFailureActionType="none" ThirdFailureActionType="none"/>
</ServiceInstall>
</Component>
- <Component Id="procrun_AMD64_Firewall" Directory="dir64" Guid="{BC605FF4-0233-4332-BC90-0C2E5FEC37D2}" KeyPath="yes">
+ <Component Id="procrun_Firewall" Directory="dir64" Guid="{BC605FF4-0233-4332-BC90-0C2E5FEC37D2}" 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" Protocol="tcp" Scope="any" />
</Component>
@@ -95,35 +80,41 @@
<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="cmp92C942ECAFC0924D02B9B447DB497D3A" Directory="PROCRUNROOT" Guid="{F4D1B5FA-F7CC-4693-9123-84B960DB98B0}" KeyPath="yes">
+ <Component Id="StartParameters" Directory="PROCRUNROOT" Guid="{F4D1B5FA-F7CC-4693-9123-84B960DB98B0}" 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="$(var.JettyClass)" Type="string"/>
+ <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="cmpF05C4062771C368BB8F3DD6673EECF15" Directory="PROCRUNROOT" Guid="{BB7062F1-573B-40BF-A761-21C31A897881}" KeyPath="yes">
+ <Component Id="StopParameters" Directory="PROCRUNROOT" Guid="{BB7062F1-573B-40BF-A761-21C31A897881}" 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="$(var.JettyClass)" Type="string"/>
+ <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="cmpBE4E97DA105319AE7A75741FACA90364" Directory="PROCRUNROOT" Guid="{0FA07510-6387-4D0D-8984-86C17759B745}" KeyPath="yes">
+ <Component Id="LogParameters" Directory="PROCRUNROOT" Guid="{0FA07510-6387-4D0D-8984-86C17759B745}" 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" />
@@ -133,12 +124,21 @@
<Permission Domain="[JETTYD_DOMAIN]" User="[PERMISSION_USER]" GenericRead="yes" GenericExecute="yes" Read="yes" />
</RegistryKey>
</Component>
- <Component Id="cmpD450CE822D5D1E635C3D66423D0E27B8" Directory="PROCRUNROOT" Guid="{62BACF23-6B8B-43C6-9B37-3992D6B86E5C}" KeyPath="yes">
+ <Component Id="JavaParameters" Directory="PROCRUNROOT" Guid="{62BACF23-6B8B-43C6-9B37-3992D6B86E5C}" 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="JvmMs" Value="256" Type="integer" />
+ <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" />
@@ -146,5 +146,19 @@
</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/scripts/jetty_script.vbs b/idp-installer/src/main/wix/scripts/jetty_script.vbs
new file mode 100644
index 000000000..f76454cc3
--- /dev/null
+++ b/idp-installer/src/main/wix/scripts/jetty_script.vbs
@@ -0,0 +1,14 @@
+' 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
diff --git a/idp-installer/src/main/wix/scripts/shib_random.vbs b/idp-installer/src/main/wix/scripts/shib_random.vbs
deleted file mode 100644
index aad00de6a..000000000
--- a/idp-installer/src/main/wix/scripts/shib_random.vbs
+++ /dev/null
@@ -1,8 +0,0 @@
-
-'Set WshShell = CreateObject("WScript.Shell")
-'WshShell.popup("Hello world")
-
-Set TypeLib = CreateObject("Scriptlet.TypeLib")
-JettyPassword=left(TypeLib.Guid, 38)
-' Prefix the property with the MM GUID....
-Session.Property("JETTY_PASS.684B3207_0D64_43E6_9E6A_3ACB8B7672D7") = JettyPassword
diff --git a/idp-installer/src/main/wix/scripts/shib_set_java_idp_home.vbs b/idp-installer/src/main/wix/scripts/shib_set_java_idp_home.vbs
deleted file mode 100644
index fe268ba05..000000000
--- a/idp-installer/src/main/wix/scripts/shib_set_java_idp_home.vbs
+++ /dev/null
@@ -1,7 +0,0 @@
-' c:\program file\foo\bar/idp/ -> c:/program file/foo/bar/idp
-newHome = Replace(Session.Property("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
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list