[java-identity-provider] 02/02: IDP-1110 Jetty9.4 Installation support

[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=2c5c65188bd68ac61f21e27348936de88297cd90

commit 2c5c65188bd68ac61f21e27348936de88297cd90
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Sep 3 10:07:29 2018 +0100

    IDP-1110 Jetty9.4 Installation support
    
    https://issues.shibboleth.net/jira/browse/IDP-1110
    
    Force the working directory for jetty to be out jetty base.
    This means we can stop making the paths absolute.  Absolute paths
    will still work but can be deprecated.
---
 idp-installer/src/main/wix/ShibbolethIdP-registry.wxs     | 1 +
 idp-installer/src/main/wix/scripts/shib_write_configs.vbs | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/idp-installer/src/main/wix/ShibbolethIdP-registry.wxs b/idp-installer/src/main/wix/ShibbolethIdP-registry.wxs
index 757488d..7d5cf31 100644
--- a/idp-installer/src/main/wix/ShibbolethIdP-registry.wxs
+++ b/idp-installer/src/main/wix/ShibbolethIdP-registry.wxs
@@ -65,6 +65,7 @@
                         <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\"/>
                 </RegistryKey>
                 <RegistryKey Key="SOFTWARE\Apache Software Foundation\Procrun 2.0\$(var.ServiceName)\Parameters\Stop" Root="HKLM" ForceCreateOnInstall="yes">
                     <Permission User="Administrators" GenericAll="yes" />
diff --git a/idp-installer/src/main/wix/scripts/shib_write_configs.vbs b/idp-installer/src/main/wix/scripts/shib_write_configs.vbs
index d9f1871..70c8e09 100644
--- a/idp-installer/src/main/wix/scripts/shib_write_configs.vbs
+++ b/idp-installer/src/main/wix/scripts/shib_write_configs.vbs
@@ -134,10 +134,10 @@ if (InstallJetty <> "") then
 '	JettyFile.WriteLine "jetty.http.port=80"
 
 '
-' Only thesew 6 properties are used.
+' Only these 6 properties are used and only the password need be changed.
 '
-	JettyFile.WriteLine "jetty.backchannel.keystore.path=" & InstallDirJava & "/credentials/idp-backchannel.p12"
-	JettyFile.WriteLine "jetty.sslContext.keyStorePath=" & InstallDirJava & "/credentials/idp-userfacing.p12"
+'	JettyFile.WriteLine "jetty.backchannel.keystore.path=../credentials/idp-backchannel.p12"
+'	JettyFile.WriteLine "jetty.sslContext.keyStorePath=../credentials/idp-userfacing.p12"
 	JettyFile.WriteLine "idp.backchannel.keystore.password=" & KeyStorePassword
 	JettyFile.WriteLine "jetty.sslContext.keyStorePassword=" & SsoStorePassword
 '	JettyFile.WriteLine "idp.backchannel.keystore.type=PKCS12"

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