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

[noreply at shibboleth.net]

Author: rdw
Date: Tue Sep 16 07:28:53 2014
New Revision: 6533

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6533&view=rev
Log:
IDP 469 V2 to V3 in a one -off prepopulation step.  As always old configuration is saved.

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=6533&r1=6532&r2=6533&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/build.xml (original)
+++ trunk/idp-distribution/src/main/resources/bin/build.xml Tue Sep 16 07:28:53 2014
@@ -4,9 +4,9 @@
 	<taskdef resource="net/shibboleth/idp/installer/ant.xml" />
 
 	<!-- TODO 
-  
-    V2 to V3 upgrade
-    V3 to V3 , detect if it is V2
+       
+       V2 to V3 upgrade
+       V3 to V3 , detect if it is V2
     -->
 
 	<!--  TARGETS:
@@ -47,8 +47,8 @@
 
 	<target name="install" depends="init, getsource, allinput, copy-distribution, install-nocopy" />
 	<target name="install-nocopy" depends="init, allinput, genkeys, upgrade, build-war" />
-	<target name="v2upgrade" depends="init, getsource, allinput, v2v3prepopulate, copy-distribution, install-nocopy" />
-	<target name="v2upgrade-nocopy" depends="init, allinput, v2v3prepopulate, install-nocopy" />
+	<target name="v2upgrade" depends="init, gettarget, v2v3prepopulate, getsource, allinput,copy-distribution, install-nocopy" />
+	<target name="v2upgrade-nocopy" depends="init, gettarget, v2v3prepopulate, allinput, install-nocopy" />
 
 	<!-- USER INPUT -->
 	<target name="allinput" depends="gettarget, checkproperties, gethostname, geturisubjectaltname, getkeystorepassword, getsealerpassword, getsealeralias, getentityid" />
@@ -121,7 +121,14 @@
 	<target name="checkproperties" depends="gettarget">
 		<available property="idp.signing.present" file="${idp.target.dir}/creds/idp-signing.crt" />
 		<available property="idp.encryption.present" file="${idp.target.dir}/creds/idp-encryption.crt" />
-		<available property="idp.keystore.present" file="${idp.target.dir}/creds/idp-tls.p12" />
+		<available property="idp.p12.keystore.present" file="${idp.target.dir}/creds/idp-tls.p12" />
+		<available property="idp.jks.keystore.present" file="${idp.target.dir}/creds/idp-tls.jks" />
+		<condition property="idp.keystore.present">
+			<or>
+				<istrue value="${idp.p12.keystore.present}" />
+				<istrue value="${idp.jks.keystore.present}" />
+			</or>
+		</condition>
 		<available property="idp.sealer.present" file="${idp.target.dir}/creds/sealer.kver" />
 		<available property="idp.properties.present" file="${idp.target.dir}/conf/idp.properties" />
 		<condition property="idp.will.call.certgen">
@@ -142,13 +149,28 @@
 			</or>
 		</condition>
 
+		<condition property="idp.ask.entityid">
+			<!-- Ask for EntityID if this is not an upgrade and the property file wasn't provided -->
+			<and>
+				<not>
+					<isset property="idp.merge.properties" />
+				</not>
+				<not>
+					<istrue value="${idp.properties.present}" />
+				</not>
+			</and>
+		</condition>
+
 		<condition property="idp.ask.hostname">
-			<!-- We ask for host name if there is no host name and we will call certgen -->
+			<!-- We ask for host name if there is no host name and we will call certgen or ask for entityID -->
 			<and>
 				<not>
 					<isset property="idp.host.name" />
 				</not>
-				<istrue value="${idp.will.call.certgen}" />
+				<or>
+					<istrue value="${idp.will.call.certgen}" />
+					<istrue value="${idp.ask.entityid}" />
+				</or>
 			</and>
 		</condition>
 
@@ -194,18 +216,6 @@
 				</not>
 				<not>
 					<istrue value="${idp.sealer.present}" />
-				</not>
-			</and>
-		</condition>
-
-		<condition property="idp.ask.entityid">
-			<!-- Ask for EntityID if this is not an upgrade and the property file wasn't provided -->
-			<and>
-				<not>
-					<isset property="idp.merge.properties" />
-				</not>
-				<not>
-					<istrue value="${idp.properties.present}" />
 				</not>
 			</and>
 		</condition>
@@ -250,7 +260,7 @@
 
 	<target name="keystore" unless="idp.keystore.present" depends="getkeystorepassword, gethostname, geturisubjectaltname">
 		<echo>Creating TLS keystore, hostname ${idp.host.name} URI = ${idp.uri.subject.alt.name} password supressed</echo>
-		<selfsignedcert hostname="${idp.host.name}" keystoreFile="${idp.target.dir}/creds/idp-tls.p12" keystorePassword="${idp.keystore.password}" uriSubjectAltNames="${idp.uri.subject.alt.name}" />
+		<selfsignedcert hostname="${idp.host.name}" keystoreFile="${idp.target.dir}/creds/idp-tls.p12" certificateFile="${idp.target.dir}/creds/idp-tls.crt" keystorePassword="${idp.keystore.password}" uriSubjectAltNames="${idp.uri.subject.alt.name}" />
 	</target>
 
 	<target name="sealer" unless="idp.sealer.present" depends="getsealerpassword, getsealeralias">
@@ -322,7 +332,7 @@
 		<local name="target" />

[... 68 lines stripped ...]