[java-identity-provider] 01/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=12c6a3e1eac10086ac68a9fb71da57dc43cc00d1

commit 12c6a3e1eac10086ac68a9fb71da57dc43cc00d1
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sun Sep 2 15:42:48 2018 +0100

    IDP-1110 Jetty9.4 Installation support
    
    https://issues.shibboleth.net/jira/browse/IDP-1110
    
    The source for start.d\idp.ini is start.d.dist\idp.ini.windows.
    There is a new reserved ini file idp-system.ini.
    The property names have changed.
---
 .../src/main/resources/bin/ant-jetty.xml           |  8 +++---
 .../src/main/wix/ShibbolethIdP-registry.wxs        |  1 +
 .../src/main/wix/scripts/shib_write_configs.vbs    | 29 +++++++++++++---------
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/idp-distribution/src/main/resources/bin/ant-jetty.xml b/idp-distribution/src/main/resources/bin/ant-jetty.xml
index 995a0b0..9663635 100644
--- a/idp-distribution/src/main/resources/bin/ant-jetty.xml
+++ b/idp-distribution/src/main/resources/bin/ant-jetty.xml
@@ -80,12 +80,14 @@
         <mkdir dir="static" />
     </target>
 
-    <target name="copyinis" depends="properties, directories, copyidpini, rewriteidpini"/>
+    <target name="copyinis" depends="properties, directories, copyidpini, rewriteidpini">
+        <copy file="${idp.target.dir}/jetty-base/start.d.dist/idp-system.ini" toFile="${idp.target.dir}/jetty-base/start.d/idp-system.ini" overwrite="true" force="true" />
+     </target>
 
     <target name="copyidpini" depends="directories" unless="idp.ini.present">
-        <mergeproperties inFile="${idp.target.dir}/jetty-base/start.d.dist/idp.ini" outFile="${idp.target.dir}/jetty-base/start.d/idp.ini" mergeFile="${jetty.merge.properties}" />
+        <mergeproperties inFile="${idp.target.dir}/jetty-base/start.d.dist/idp.ini.windows" outFile="${idp.target.dir}/jetty-base/start.d/idp.ini" mergeFile="${jetty.merge.properties}" />
     </target>
-	
+
     <target name="rewriteidpini" depends="directories" if="idp.ini.present">
         <rewriteproperties inFile="${idp.target.dir}/jetty-base/start.d/idp.ini" outFile="${idp.target.dir}/jetty-base/start.d/idp.ini" propertyNameFile="${idp.target.dir}/jetty-base/start.d.dist/idp.ini.rewrite.property.names" />
     </target>
diff --git a/idp-installer/src/main/wix/ShibbolethIdP-registry.wxs b/idp-installer/src/main/wix/ShibbolethIdP-registry.wxs
index 5fbac12..757488d 100644
--- a/idp-installer/src/main/wix/ShibbolethIdP-registry.wxs
+++ b/idp-installer/src/main/wix/ShibbolethIdP-registry.wxs
@@ -46,6 +46,7 @@
                         <Permission User="Administrators" GenericAll="yes" />
                         <Permission User="SYSTEM" GenericAll="yes" />
                         <MultiStringValue>-Didp.home=[JAVA_IDP_HOME]</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>
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 e2435eb..d9f1871 100644
--- a/idp-installer/src/main/wix/scripts/shib_write_configs.vbs
+++ b/idp-installer/src/main/wix/scripts/shib_write_configs.vbs
@@ -124,19 +124,24 @@ if (InstallJetty <> "") then
 	JettyFile.WriteLine "# File to be merged into jetty's idp.ini file"
 	JettyFile.WriteLine "#"
 
-	JettyFile.WriteLine "jetty.host=0.0.0.0"
-	JettyFile.WriteLine "jetty.https.port=443"
-	JettyFile.WriteLine "jetty.backchannel.port=8443"
+'
+' Redundant - no longer in idp.ini.windows
+'
+'	JettyFile.WriteLine "jetty.ssl.host=0.0.0.0"
+'	JettyFile.WriteLine "jetty.ssl.port=443"
+'	JettyFile.WriteLine "idp.war.path="../war/idp.war"
+'	JettyFile.WriteLine "jetty.http.host=localhost"
+'	JettyFile.WriteLine "jetty.http.port=80"
+
+'
+' Only thesew 6 properties are used.
+'
 	JettyFile.WriteLine "jetty.backchannel.keystore.path=" & InstallDirJava & "/credentials/idp-backchannel.p12"
-	JettyFile.WriteLine "jetty.browser.keystore.path=" & InstallDirJava & "/credentials/idp-userfacing.p12"
-	JettyFile.WriteLine "jetty.backchannel.keystore.password=" & KeyStorePassword
-	JettyFile.WriteLine "jetty.browser.keystore.password=" & SsoStorePassword
-	JettyFile.WriteLine "jetty.backchannel.keystore.type=PKCS12"
-	JettyFile.WriteLine "jetty.browser.keystore.type=PKCS12"
-	JettyFile.WriteLine "jetty.war.path=" & InstallDirJava & "/war/idp.war"
-	JettyFile.WriteLine "jetty.jaas.path=" & InstallDirJava & "/conf/authn/jaas.config"
-	JettyFile.WriteLine "jetty.nonhttps.host=localhost"
-	JettyFile.WriteLine "jetty.nonhttps.port=80"
+	JettyFile.WriteLine "jetty.sslContext.keyStorePath=" & InstallDirJava & "/credentials/idp-userfacing.p12"
+	JettyFile.WriteLine "idp.backchannel.keystore.password=" & KeyStorePassword
+	JettyFile.WriteLine "jetty.sslContext.keyStorePassword=" & SsoStorePassword
+'	JettyFile.WriteLine "idp.backchannel.keystore.type=PKCS12"
+'	JettyFile.WriteLine "jetty.sslContext.keyStoreType=PKCS12"
 
 	JettyFile.Close
     else

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