[java-idp-jetty-base] 01/02: untabify
Rod Widdowson
rdw at steadingsoftware.com
Mon Jul 31 14:24:31 UTC 2023
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch 10-windows
in repository java-idp-jetty-base.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-jetty-base.git;a=commit;h=a4fce77f1865c3a82d4da25277867c1bdbdbae4d
commit a4fce77f1865c3a82d4da25277867c1bdbdbae4d
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Jul 31 14:50:59 2023 +0100
untabify
---
src/main/wix/Jetty-Main.wxs | 102 ++++++++++++++++++++---------------------
src/main/wix/Jetty-Procrun.wxs | 10 ++--
src/main/wix/Jetty-User.wxs | 24 +++++-----
3 files changed, 68 insertions(+), 68 deletions(-)
diff --git a/src/main/wix/Jetty-Main.wxs b/src/main/wix/Jetty-Main.wxs
index 2207449..ca8962b 100644
--- a/src/main/wix/Jetty-Main.wxs
+++ b/src/main/wix/Jetty-Main.wxs
@@ -19,35 +19,35 @@
<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" />
+ <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" />
+ <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>
+ <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 -->
+ <!-- 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" />
+ <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 -->
+ <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>
+ <ComponentGroupRef Id="DeleteFiles" /> <!--DOne-->
+ <ComponentRef Id="SaveUserInfo" />
+ <ComponentRef Id="Icon" />
+ </Feature>
- <Directory Id="TARGETDIR" Name="SourceDir">
+ <Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="CommonAppDataFolder">
<Directory Id="ProgramDataShib" Name="Shibboleth">
<Directory Id="IDPDISTDIR" Name="IdP"/>
@@ -55,12 +55,12 @@
</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="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" />
@@ -68,7 +68,7 @@
</Directory>
</Directory>
- <Component Id="Icon" Guid="{C866B1EC-63E2-4379-BAA3-4D3936AE1BEC}" Directory="IDP_INSTALLDIR" Win64="yes">
+ <Component Id="Icon" Guid="{C866B1EC-63E2-4379-BAA3-4D3936AE1BEC}" Directory="IDP_INSTALLDIR" Win64="yes">
<RegistryValue Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductCode]" Name="DisplayIcon" Value="[IDP_INSTALLDIR]\shib.ico,0" Type="string" />
</Component>
@@ -76,41 +76,41 @@
<CustomAction Id="RunFinalizeJetty" Directory="SHIBBOLETHDIR" ExeCommand="[QtFinalizeJetty]" Execute="deferred" Impersonate="no" />
<CustomAction Id="QtFinalizeJetty" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
- <InstallExecuteSequence>
+ <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>
+ </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>
+ <!-- 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 -->
+ <!-- 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="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="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="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" />
+ <UIRef Id="JettyInstallUI" />
</Product>
</Wix>
diff --git a/src/main/wix/Jetty-Procrun.wxs b/src/main/wix/Jetty-Procrun.wxs
index 0cc1ae6..4653a27 100644
--- a/src/main/wix/Jetty-Procrun.wxs
+++ b/src/main/wix/Jetty-Procrun.wxs
@@ -129,7 +129,7 @@
<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">
+ <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>
@@ -138,7 +138,7 @@
</RegistryValue>
<RegistryValue Name="JvmMx" Value="[JAVA_JVMMX]" Type="string">
<!-- Its an integer, but we added the # -->
- </RegistryValue>
+ </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,18 +146,18 @@
</Component>
</ComponentGroup>
- <Binary Id="PropertyWorkSrc" SourceFile="scripts\jetty_script.vbs" />
+ <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>
+ <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>
+ </InstallExecuteSequence>
</Fragment>
diff --git a/src/main/wix/Jetty-User.wxs b/src/main/wix/Jetty-User.wxs
index 08183f2..e7ae756 100644
--- a/src/main/wix/Jetty-User.wxs
+++ b/src/main/wix/Jetty-User.wxs
@@ -27,7 +27,7 @@
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)
+ 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)
@@ -42,8 +42,8 @@
Used in 'Permission' statments
ACE_USER - [JETTYD_DOMAIN]\[PERMISSION_USER] if JETTYD_DOMAIN supplied
- [PERMISSION_USER] Otherwise
- used in icacles
+ [PERMISSION_USER] Otherwise
+ used in icacles
-->
<Fragment>
@@ -101,38 +101,38 @@
<!-- Actions to set acls
/t recursive
- /inheritance:r Remove inhetited ACLS
+ /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="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)" />
+ 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)" />
+ 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" />
+ 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)" />
+ 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" />
+ 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" />
+ 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" />
+ 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>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list