[java-identity-provider] 01/04: Adjust more dialogs and display values for V4

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=6495cd5a5a24e4ad7d87234c80ff12f1eccdc0ea

commit 6495cd5a5a24e4ad7d87234c80ff12f1eccdc0ea
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Mar 30 11:01:28 2019 +0000

    Adjust more dialogs and display values for V4
---
 idp-installer/src/main/wix/ShibbolethIdP-install-dlg.wxs | 1 -
 idp-installer/src/main/wix/procrun.wxs                   | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/idp-installer/src/main/wix/ShibbolethIdP-install-dlg.wxs b/idp-installer/src/main/wix/ShibbolethIdP-install-dlg.wxs
index a164563..0afa64d 100644
--- a/idp-installer/src/main/wix/ShibbolethIdP-install-dlg.wxs
+++ b/idp-installer/src/main/wix/ShibbolethIdP-install-dlg.wxs
@@ -54,7 +54,6 @@
 
                 <!-- Jetty? -->
                 <Control Id="InstallJetty" Type="CheckBox" X="25" Y="128" Height="20" Width="60" Property="INSTALL_JETTY" CheckBoxValue="TRUE" Text="Install &Jetty"/>
-                <Control Id="InstallJWarn" Type="Text" X="85" Y="132" Height="20" Width="80" Text="{\JettyWarning_Font}Requires Java 1.8" />
                 <!-- AD?=" -->
 
                 <Control Id="ConfigureAD" Type="CheckBox" X="185" Y="128" Height="20" Width="150" Property="CONFIGURE_AD" CheckBoxValue="TRUE" Text="Configure for &Active Directory" />
diff --git a/idp-installer/src/main/wix/procrun.wxs b/idp-installer/src/main/wix/procrun.wxs
index 86000ba..3ef1161 100644
--- a/idp-installer/src/main/wix/procrun.wxs
+++ b/idp-installer/src/main/wix/procrun.wxs
@@ -50,7 +50,7 @@
             <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" />
                 <?if $(var.msitype) = "x86" ?>
-                <ServiceInstall Id="Service32" Name="$(var.ServiceName)" DisplayName="Shibboleth 3 IdP Daemon" Description="Runs the Jetty Container" Arguments="service $(var.ServiceName)" Type="ownProcess" Start="$(var.ServiceStart)" ErrorControl="normal" />
+                <ServiceInstall Id="Service32" Name="$(var.ServiceName)" DisplayName="Shibboleth V4 IdP Daemon" Description="Runs the Jetty Container" Arguments="service $(var.ServiceName)" Type="ownProcess" Start="$(var.ServiceStart)" ErrorControl="normal" />
                 <?endif ?>
             </Component>
             <Component Id="procrun_32_Firewall" Directory="PROCRUNROOT" Guid="{F93B8D9F-7BBA-4D79-995D-4AC20FF158E4}" KeyPath="yes">

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