[java-identity-provider COMMIT] /trunk/idp-distribution/src/main/resources/bin/build.xml

[noreply at shibboleth.net]

Author: scantor
Date: Tue Oct 14 22:18:39 2014
New Revision: 6708

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6708&view=rev
Log:
Put built warfile in war/idp.war to match V2 location.

Modified:
    trunk/idp-distribution/src/main/resources/bin/build.xml

Modified: trunk/idp-distribution/src/main/resources/bin/build.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/bin/build.xml?rev=6708&r1=6707&r2=6708&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/build.xml (original)
+++ trunk/idp-distribution/src/main/resources/bin/build.xml Tue Oct 14 22:18:39 2014
@@ -468,8 +468,8 @@
 			<fileset dir="${idp.target.dir}/edit-webapp" />
 		</copy>
 		<!-- build a jar, not war, since it is already fully populated -->
-		<delete file="${idp.target.dir}/idp.war" failonerror="false" />
-		<jar destfile="${idp.target.dir}/idp.war" basedir="${idp.target.dir}/webapp" />
+		<delete file="${idp.target.dir}/war/idp.war" failonerror="false" />
+		<jar destfile="${idp.target.dir}/war/idp.war" basedir="${idp.target.dir}/webapp" />
 	</target>
 
 	<!-- specify getsource before get target to force target default-->
@@ -539,6 +539,7 @@
 		<copy todir="${idp.target.dir}/system">
 			<fileset dir="${idp.src.dir}/system" />
 		</copy>
+		<mkdir dir="${idp.target.dir}/war" />
 		<mkdir dir="${idp.target.dir}/webapp" />
 		<copy todir="${idp.target.dir}/webapp">
 			<fileset dir="${idp.src.dir}/webapp" />