Author: scantor
Date: Tue Oct 14 12:17:29 2014
New Revision: 6690
URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6690&view=rev
Log:
Avoid backchannel keygen on V2 upgrade.
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=6690&r1=6689&r2=6690&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/build.xml (original)
+++ trunk/idp-distribution/src/main/resources/bin/build.xml Tue Oct 14 12:17:29 2014
@@ -183,6 +183,7 @@
<available property="idp.metadata.present" file="${idp.target.dir}/metadata/idp-metadata.xml" />
<condition property="idp.backchannel.present">
<or>
+ <istrue value="${idp.is.V2}" />
<istrue value="${idp.p12.keystore.present}" />
<istrue value="${idp.jks.keystore.present}" />
</or>
@@ -191,27 +192,22 @@
<available property="idp.properties.present" file="${idp.target.dir}/conf/idp.properties" />
<condition property="idp.will.call.certgen">
<!--
- we will call the cert gen if this is not a V2 upgrade
- AND EITHER we don't have a signing keypair
+ we will call the cert gen if
+ EITHER we don't have a signing keypair
OR we don't have a encryption keypair
OR we don't have a backchannel keystore
-->
- <and>
- <not>
- <istrue value="${idp.is.V2}" />
- </not>
- <or>
- <not>
- <istrue value="${idp.signing.present}" />
- </not>
- <not>
- <istrue value="${idp.encryption.present}" />
- </not>
- <not>
- <istrue value="${idp.backchannel.present}" />
- </not>
- </or>
- </and>
+ <or>
+ <not>
+ <istrue value="${idp.signing.present}" />
+ </not>
+ <not>
+ <istrue value="${idp.encryption.present}" />
+ </not>
+ <not>
+ <istrue value="${idp.backchannel.present}" />
+ </not>
+ </or>
</condition>
<condition property="idp.ask.entityid">