[java-identity-provider] branch master updated: IDP-994 Stop the shibd_idp service during update an uninstall

[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=da870ba9734625bbd69c1b11665f739815a57abb

The following commit(s) were added to refs/heads/master by this push:
       new  da870ba   IDP-994 Stop the shibd_idp service during update an uninstall
da870ba is described below

commit da870ba9734625bbd69c1b11665f739815a57abb
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Jun 29 14:53:17 2018 +0100

    IDP-994 Stop the shibd_idp service during update an uninstall
    
    https://issues.shibboleth.net/jira/browse/IDP-994
    
    A second attempt.
---
 idp-installer/src/main/wix/Jetty.bat   | 2 +-
 idp-installer/src/main/wix/procrun.wxs | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/idp-installer/src/main/wix/Jetty.bat b/idp-installer/src/main/wix/Jetty.bat
index 1374379..2ce2f54 100644
--- a/idp-installer/src/main/wix/Jetty.bat
+++ b/idp-installer/src/main/wix/Jetty.bat
@@ -1,4 +1,4 @@
-rem @Echo off
+ at Echo off
 REM Generate msm
 setlocal
 
diff --git a/idp-installer/src/main/wix/procrun.wxs b/idp-installer/src/main/wix/procrun.wxs
index d0edbd3..86000ba 100644
--- a/idp-installer/src/main/wix/procrun.wxs
+++ b/idp-installer/src/main/wix/procrun.wxs
@@ -76,12 +76,8 @@
                 <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 ForceCreateOnInstall="yes" Key="SYSTEM\CurrentControlSet\services\$(var.ServiceName)\Parameters" Root="HKLM" />
-                <ServiceControl Id="controlService" Name="$(var.ServiceName)" Stop="both" Remove="uninstall" Start="install" Wait="no" />
-            </Component>
-            <Component Id="ServiceParametersStop" Directory="PROCRUNROOT" Guid="{C1A519A5-1FD9-4BA7-85CD-6D4D532D7C4F}" KeyPath="yes">
-                <Condition>Installed</Condition>
-                <!-- Stop component here - and wait -->
-                <ServiceControl Id="controlServiceUninstall" Name="$(var.ServiceName)" Stop="both" Remove="uninstall" Start="install" Wait="yes" />
+                <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">
                 <!-- ForceDeleteOnUninstall stops us accumulating Stop keys -->

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