[java-identity-provider COMMIT] in /trunk: idp-conf/src/test/resources/creds/idp-backchannel.p12 idp-conf/src/test/re...

[noreply at shibboleth.net]

Author: rdw
Date: Fri Sep 26 04:52:48 2014
New Revision: 6586

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6586&view=rev
Log:
use sensible names for user facing and back channel keystores

Added:
    trunk/idp-conf/src/test/resources/creds/idp-backchannel.p12
      - copied unchanged from r6585, trunk/idp-conf/src/test/resources/creds/idp-tls.p12
Modified:
    trunk/idp-conf/src/test/resources/creds/idp-tls.p12
    trunk/idp-distribution/src/main/resources/bin/build.xml
    trunk/idp-distribution/src/main/resources/bin/jetty.xml
    trunk/idp-distribution/src/main/resources/jetty-base/start.d/idp.ini

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=6586&r1=6585&r2=6586&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/build.xml (original)
+++ trunk/idp-distribution/src/main/resources/bin/build.xml Fri Sep 26 04:52:48 2014
@@ -127,8 +127,8 @@
 	<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.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" />
+		<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.keystore.present">
 			<or>
@@ -270,7 +270,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>
         <mkdir dir="${idp.target.dir}/creds"/>
-		<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}" />
+		<selfsignedcert hostname="${idp.host.name}" keystoreFile="${idp.target.dir}/creds/idp-backchannel.p12" certificateFile="${idp.target.dir}/creds/idp-backchannel.crt" keystorePassword="${idp.keystore.password}" uriSubjectAltNames="${idp.uri.subject.alt.name}" />
 	</target>
 
 	<target name="sealer" unless="idp.sealer.present" depends="getsealerpassword, getsealeralias">
@@ -464,8 +464,8 @@
 		<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-tls.crt" failonerror="false" />
-		<copy file="${idp.target.dir}/credentials.v2/idp.jks" tofile="${idp.target.dir}/creds/idp-tls.jks" 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" />
 
 	</target>
 

Modified: trunk/idp-distribution/src/main/resources/bin/jetty.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/bin/jetty.xml?rev=6586&r1=6585&r2=6586&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/jetty.xml (original)
+++ trunk/idp-distribution/src/main/resources/bin/jetty.xml Fri Sep 26 04:52:48 2014
@@ -39,37 +39,37 @@
 	<target name="properties">
 		<property file="${jetty.property.file}" />
 		<available property="idp.ini.present" file="${idp.target.dir}/jetty-base/start.d/idp.ini" />
-		<available property="idp.tls.jks.present" file="${idp.target.dir}/creds/idp-tls.jks" />
-		<available property="idp.ssl.jks.present" file="${idp.target.dir}/creds/idp-ssl.jks" />
-		<available property="idp.ssl.p12.present" file="${idp.target.dir}/creds/idp-ssl.p12" />
-		<condition property="generate.ssl.p12">
+		<available property="idp.backchannel.jks.present" file="${idp.target.dir}/creds/idp-backchannel.jks" />
+		<available property="idp.userfacing.jks.present" file="${idp.target.dir}/creds/idp-userfacing.jks" />
+		<available property="idp.userfacing.p12.present" file="${idp.target.dir}/creds/idp-userfacing.p12" />

[... 56 lines stripped ...]