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

[noreply at shibboleth.net]

Author: iay
Date: Thu Jan  1 08:20:11 2015
New Revision: 7224

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7224&view=rev
Log:
White space normalisation.

Remove trailing white space, use spaces instead of tabs for indentation.

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=7224&r1=7223&r2=7224&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/build.xml (original)
+++ trunk/idp-distribution/src/main/resources/bin/build.xml Thu Jan  1 08:20:11 2015
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="Shibboleth Identity Provider V3" basedir=".." default="install"
-	xmlns:if="ant:if"
-	xmlns:unless="ant:unless">
-
-	<taskdef resource="net/shibboleth/idp/installer/ant.xml" />
-
-	<!--  TARGETS:
+    xmlns:if="ant:if"
+    xmlns:unless="ant:unless">
+
+    <taskdef resource="net/shibboleth/idp/installer/ant.xml" />
+
+    <!--  TARGETS:
 
         The following top level targets are implemented and supported.  These in turn call subsidiary targets,
         whose use outside this file is not supported.
@@ -16,11 +16,11 @@
         build-war:       Create the war file
         install:         Copies files from the specified target to the distribution and then
                          invokes install-nocopy
-        
+
         PROPERTIES:
         The following properties are used.  If they are not specified on the command line then
         There will be prompted for if needed.
-        
+
         idp.src.dir (update only):  Where to install from.  No default
         idp.target.dir (all): where to install to.  Default is basedir.
         idp.host.name: If we are creating certificates
@@ -43,88 +43,88 @@
         idp.no.tidy: Do not delete the two above files (debug only)
         idp.jetty.config: Copy jetty configuration from distribution (Unsupported)
         ldap.merge.properties:  The name of a property file to merge with ldap.properties
-        
+
         The property idp.noprompt will cause a failure rather than a prompt.
-	-->
-
-	<target name="init">
-		<tstamp />
-		<hostinfo />
-		<echo append="true" file="idp_ant.log">target: Init
-		</echo>
-	</target>
-
-	<target name="install" depends="init, preload, getsource, gettarget, v2v3prepopulate, allinput, copy-distribution, copy-jetty-distribution, install-nocopy, tidy" />
-	<target name="install-nocopy" depends="init, preload, gettarget, v2v3prepopulate, allinput, genkeys, upgrade, metadata-gen, reprotect, build-war, tidy" />
-
-	<!-- USER INPUT -->
-	<target name="preload" if="idp.property.file">
-	   <echo append="true" file="idp_ant.log">target: Preload
-	   </echo>
-	   <property file="${idp.property.file}"/>
-    </target>
-	<target name="allinput" depends="gettarget, checkproperties, gethostname, getentityid, geturisubjectaltname, setscope, askscope, getkeystorepassword, getsealerpassword, getsealeralias" />
-
-	<target name="gethostname" if="idp.ask.hostname" depends="checkproperties">
-		<echo append="true" file="idp_ant.log">target: gethostname
-		</echo>
-		<fail if="idp.noprompt">Input needed, silence demanded</fail>
-		<input message="Hostname:" addproperty="idp.host.name" defaultvalue="${NAME}.${DOMAIN}" />
-	</target>
-
-	<target name="geturisubjectaltname" if="idp.generate.altname" depends="checkproperties, gethostname">
-		<echo append="true" file="idp_ant.log">target: geturisubjectname
-		</echo>
-		<property name="idp.uri.subject.alt.name" value="https://${idp.host.name}/idp/shibboleth" />
-	</target>
-
-	<target name="getkeystorepassword" if="idp.ask.keystore.password" depends="checkproperties">
-		<echo append="true" file="idp_ant.log">target: getkeystorepassword
-		</echo>
-		<fail if="idp.noprompt">Input needed, silence demanded</fail>
-		<input message="TLS Private Key Password: " addproperty="idp.keystore.password">
-			<handler classname="net.shibboleth.idp.installer.ant.PasswordHandler"/>
-	    </input>
-	</target>
-
-	<target name="getsealerpassword" if="idp.ask.sealer.password" depends="checkproperties">
-		<echo append="true" file="idp_ant.log">target: getsealerpassword
-		</echo>
-		<fail if="idp.noprompt">Input needed, silence demanded</fail>
-		<input message="Cookie Encryption Key Password: " addproperty="idp.sealer.password">
+    -->
+
+    <target name="init">
+        <tstamp />
+        <hostinfo />
+        <echo append="true" file="idp_ant.log">target: Init
+        </echo>
+    </target>
+
+    <target name="install" depends="init, preload, getsource, gettarget, v2v3prepopulate, allinput, copy-distribution, copy-jetty-distribution, install-nocopy, tidy" />
+    <target name="install-nocopy" depends="init, preload, gettarget, v2v3prepopulate, allinput, genkeys, upgrade, metadata-gen, reprotect, build-war, tidy" />
+
+    <!-- USER INPUT -->
+    <target name="preload" if="idp.property.file">

[... 1159 lines stripped ...]