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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Oct 14 18:11:24 2014
New Revision: 6697

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6697&view=rev
Log:
IDP-485 - s/service/services

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=6697&r1=6696&r2=6697&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/build.xml (original)
+++ trunk/idp-distribution/src/main/resources/bin/build.xml Tue Oct 14 18:11:24 2014
@@ -32,7 +32,7 @@
             - if idp.noprompt is set, then this file should contain a line setting idp.entityID.
             - if idp.sealer.password is set, then this file should contain a line setting idp.sealer.storePassword and idp.sealer.keyPassword
             - if idp.scope is present, then this file should contain a line setting idp.scope
-        service.merge.properties: The name of a property file to merge with service.properties
+        services.merge.properties: The name of a property file to merge with services.properties
         	- if idp.is.V2 is set, then this file should contain a line setting idp.service.relyingparty.legacy=true
         idp.property.file: The name of a property file to fill in some or all of the above. This file is deleted after processing.
         idp.no.tidy: Do not delete the two above files (debug only)
@@ -197,7 +197,7 @@
 		</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" />
-		<available property="service.properties.present" file="${idp.target.dir}/conf/service.properties" />
+		<available property="services.properties.present" file="${idp.target.dir}/conf/services.properties" />
 		<condition property="idp.will.call.certgen">
 			<!--
 			we will call the cert gen if
@@ -379,7 +379,7 @@
 
     -->
 
-	<target name="upgrade" depends="editproperties, editserviceproperties">
+	<target name="upgrade" depends="editproperties, editservicesproperties">
 		<echo append="true" file="idp_ant.log">target: upgrade
 		</echo>
 		<!-- Create edit-webapp tree -->
@@ -429,11 +429,11 @@
 		<mergeproperties inFile="${idp.target.dir}/dist/conf/idp.properties.dist" outFile="${idp.target.dir}/conf/idp.properties" mergeFile="${idp.merge.properties}" />
 	</target>
 
-	<target name="editserviceproperties" depends="gettarget" if="idp.is.V2" unless="service.properties.present">
-		<echo append="true" file="idp_ant.log">target: editserviceproperties
+	<target name="editservicesproperties" depends="gettarget" if="idp.is.V2" unless="services.properties.present">
+		<echo append="true" file="idp_ant.log">target: editservicesproperties
 		</echo>
 		<mkdir dir="${idp.target.dir}/conf" />
-		<mergeproperties inFile="${idp.target.dir}/dist/conf/service.properties.dist" outFile="${idp.target.dir}/conf/service.properties" mergeFile="${service.merge.properties}" />
+		<mergeproperties inFile="${idp.target.dir}/dist/conf/services.properties.dist" outFile="${idp.target.dir}/conf/services.properties" mergeFile="${services.merge.properties}" />
 	</target>
 
 	<target name="metadata-gen" depends="gettarget, getentityid, gethostname, genkeys, upgrade"  unless="idp.metadata.present">
@@ -575,10 +575,10 @@
 		<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" />
 
-        <echo file="replace.service.properties" append="yes">
+        <echo file="replace.services.properties" append="yes">
         	idp.service.relyingparty.legacy=true
         </echo>
-        <property name="service.merge.properties" value="replace.service.properties" />
+        <property name="services.merge.properties" value="replace.services.properties" />
 	</target>
 
 	<target name="v2detect" depends="gettarget">
@@ -599,7 +599,7 @@
 		<echo append="true" file="idp_ant.log">target: tidy
 		</echo>
 		<delete file="${idp.merge.properties}" failonerror="false" />
-		<delete file="${service.merge.properties}" failonerror="false" />
+		<delete file="${services.merge.properties}" failonerror="false" />
         <delete file="${idp.property.file}" failonerror="false" />
 	</target>