[java-identity-provider] branch master updated: IDP-1334 Stop using "Webapp" as staging area for build.

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

The following commit(s) were added to refs/heads/master by this push:
       new  f8a65b9   IDP-1334  Stop using "Webapp" as staging area for build.
f8a65b9 is described below

commit f8a65b915aeee2b45ffb324e3789d134321d3a9f
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Sep 22 14:51:03 2018 +0100

    IDP-1334  Stop using "Webapp" as staging area for build.
    
    https://issues.shibboleth.net/jira/browse/IDP-1334
    
    Use webapp.tmp instead.  Further delete this directory before and after
    a war build.
    
    Delete the old webapp folder if there is one - which deals with the
    V3.3->3.4 update and causes predictable failures if people are running
    out of an unpacked webapp folder.
---
 idp-distribution/src/main/resources/bin/build.xml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/idp-distribution/src/main/resources/bin/build.xml b/idp-distribution/src/main/resources/bin/build.xml
index 196844c..3c03eca 100644
--- a/idp-distribution/src/main/resources/bin/build.xml
+++ b/idp-distribution/src/main/resources/bin/build.xml
@@ -557,18 +557,20 @@
     -->
     <target name="build-war" depends="gettarget">
         <!-- no logging -->
+        <delete dir="${idp.target.dir}/webapp" failonerror="false" />
+        <delete dir="${idp.target.dir}/webapp.tmp" failonerror="false" />
         <echo>Rebuilding ${idp.target.dir}/war/idp.war ...</echo>
-        <mkdir dir="${idp.target.dir}/webapp" />
-        <copy todir="${idp.target.dir}/webapp" preservelastmodified="true" failonerror="true">
+        <mkdir dir="${idp.target.dir}/webapp.tmp" />
+        <copy todir="${idp.target.dir}/webapp.tmp" preservelastmodified="true" failonerror="true">
             <fileset dir="${idp.target.dir}/dist/webapp" />
         </copy>
-        <copy todir="${idp.target.dir}/webapp" overwrite="true" preservelastmodified="true" failonerror="true">
+        <copy todir="${idp.target.dir}/webapp.tmp" overwrite="true" preservelastmodified="true" failonerror="true">
             <fileset dir="${idp.target.dir}/edit-webapp" />
         </copy>
         <!-- build a jar, not war, since it is already fully populated -->
         <delete file="${idp.target.dir}/war/idp.war" failonerror="true" />
-        <jar destfile="${idp.target.dir}/war/idp.war" basedir="${idp.target.dir}/webapp" />
-        <delete dir="${idp.target.dir}/webapp" failonerror="true" />
+        <jar destfile="${idp.target.dir}/war/idp.war" basedir="${idp.target.dir}/webapp.tmp" />
+        <delete dir="${idp.target.dir}/webapp.tmp" failonerror="true" />
         <echo>...done</echo>
     </target>
 

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