[java-identity-provider] branch master updated: IDP-1110 Support for Jetty 9.4: property name rewriting

[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=9b9fb369a132d37867217149282abd8b8e99bd57

The following commit(s) were added to refs/heads/master by this push:
       new  9b9fb36   IDP-1110 Support for Jetty 9.4: property name rewriting
9b9fb36 is described below

commit 9b9fb369a132d37867217149282abd8b8e99bd57
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Jun 7 14:04:58 2018 +0100

    IDP-1110 Support for Jetty 9.4: property name rewriting
    
    https://issues.shibboleth.net/jira/browse/IDP-1110
    
    Checked in initial support for this.  We expect to find a file in
    jetty-base\start.d called "idp.ini.rewrite.propoerty.names"
---
 idp-distribution/src/main/resources/bin/ant-jetty.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/idp-distribution/src/main/resources/bin/ant-jetty.xml b/idp-distribution/src/main/resources/bin/ant-jetty.xml
index 12e3e56..100a863 100644
--- a/idp-distribution/src/main/resources/bin/ant-jetty.xml
+++ b/idp-distribution/src/main/resources/bin/ant-jetty.xml
@@ -80,7 +80,7 @@
         <mkdir dir="static" />
     </target>
 
-    <target name="copyinis" depends="directories, copyidpini">
+    <target name="copyinis" depends="properties, directories, copyidpini, rewriteidpini">
         <copy file="jetty-base/start.d.dist/jsp.ini" tofile="jetty-base/start.d/jsp.ini" overwrite="false" failonerror="false" />
         <copy file="jetty-base/start.d.dist/jstl.ini" tofile="jetty-base/start.d/jstl.ini" overwrite="false" failonerror="false" />
     </target>
@@ -88,6 +88,11 @@
     <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}" />
     </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>
+
 
    <target name="reprotect">
        <chmod perm="600" dir="jetty-base/start.d" includes="**/*.key"/>

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