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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Oct 14 13:37:01 2014
New Revision: 6691

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6691&view=rev
Log:
IDP-481 - typo in jettty-base, don't generate metadata or create backchannel.crt on V2 upgrades

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=6691&r1=6690&r2=6691&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/build.xml (original)
+++ trunk/idp-distribution/src/main/resources/bin/build.xml Tue Oct 14 13:37:01 2014
@@ -180,7 +180,12 @@
 		<available property="idp.encryption.present" file="${idp.target.dir}/creds/idp-encryption.crt" />
 		<available property="idp.p12.keystore.present" file="${idp.target.dir}/creds/idp-backchannel.p12" />
 		<available property="idp.jks.keystore.present" file="${idp.target.dir}/creds/idp-backchannel.jks" />
-        <available property="idp.metadata.present" file="${idp.target.dir}/metadata/idp-metadata.xml" />
+		<condition property="idp.metadata.present">
+			<or>
+				<istrue value="${idp.is.V2}" />
+		        <available file="${idp.target.dir}/metadata/idp-metadata.xml" />
+			</or>
+		</condition>
 		<condition property="idp.backchannel.present">
 			<or>
 				<istrue value="${idp.is.V2}" />
@@ -479,7 +484,7 @@
 		<delete dir="${idp.target.dir}/bin/lib" failonerror="false" />
 		<delete dir="${idp.target.dir}/dist" failonerror="false" />
 		<delete dir="${idp.target.dir}/doc" failonerror="false" />
-		<delete dir="${idp.target.dir}/jettty-base" failonerror="false" />
+		<delete dir="${idp.target.dir}/jetty-base" failonerror="false" />
 		<delete dir="${idp.target.dir}/system" failonerror="false" />
 		<delete dir="${idp.target.dir}/webapp" failonerror="false" />
 
@@ -556,7 +561,6 @@
 		<copy file="${idp.target.dir}/credentials.v2/idp.key" tofile="${idp.target.dir}/creds/idp-encryption.key" failonerror="false" />
 		<copy file="${idp.target.dir}/credentials.v2/idp.crt" tofile="${idp.target.dir}/creds/idp-signing.crt" failonerror="false" />
 		<copy file="${idp.target.dir}/credentials.v2/idp.key" tofile="${idp.target.dir}/creds/idp-signing.key" failonerror="false" />
-		<copy file="${idp.target.dir}/credentials.v2/idp.crt" tofile="${idp.target.dir}/creds/idp-backchannel.crt" failonerror="false" />
 		<copy file="${idp.target.dir}/credentials.v2/idp.jks" tofile="${idp.target.dir}/creds/idp-backchannel.jks" failonerror="false" />
 		<copy file="${idp.target.dir}/credentials.v2/idp.p12" tofile="${idp.target.dir}/creds/idp-backchannel.p12" failonerror="false" />
 	</target>