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

[noreply at shibboleth.net]

Author: iay
Date: Thu Jan  1 08:49:58 2015
New Revision: 7226

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7226&view=rev
Log:
IDP-558 installer log file formatting issue

Fix formatting, simplify for the future by using a macro.

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=7226&r1=7225&r2=7226&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:49:58 2015
@@ -47,11 +47,17 @@
         The property idp.noprompt will cause a failure rather than a prompt.
     -->
 
+    <macrodef name="TGT" description="log the invocation of an Ant target">
+        <text name="t" description="name of the target being invoked"/>
+        <sequential>
+            <echo append="true" file="idp_ant.log">target: @{t}${line.separator}</echo>
+        </sequential>
+    </macrodef>
+
     <target name="init">
         <tstamp />
         <hostinfo />
-        <echo append="true" file="idp_ant.log">target: Init
-        </echo>
+        <TGT>init</TGT>
     </target>
 
     <target name="install" depends="init, preload, getsource, gettarget, v2v3prepopulate, allinput, copy-distribution, copy-jetty-distribution, install-nocopy, tidy" />
@@ -59,28 +65,24 @@
 
     <!-- USER INPUT -->
     <target name="preload" if="idp.property.file">
-       <echo append="true" file="idp_ant.log">target: Preload
-       </echo>
-       <property file="${idp.property.file}"/>
+        <TGT>preload</TGT>
+        <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>
+        <TGT>gethostname</TGT>
         <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>
+        <TGT>geturisubjectname</TGT>
         <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>
+        <TGT>getkeystorepassword</TGT>
         <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"/>
@@ -88,8 +90,7 @@
     </target>
 
     <target name="getsealerpassword" if="idp.ask.sealer.password" depends="checkproperties">
-        <echo append="true" file="idp_ant.log">target: getsealerpassword
-        </echo>
+        <TGT>getsealerpassword</TGT>
         <fail if="idp.noprompt">Input needed, silence demanded</fail>
         <input message="Cookie Encryption Key Password: " addproperty="idp.sealer.password">
             <handler classname="net.shibboleth.idp.installer.ant.PasswordHandler"/>
@@ -103,8 +104,7 @@
     </target>
 
     <target name="getsealeralias" if="idp.ask.sealer.alias" depends="checkproperties">
-        <echo append="true" file="idp_ant.log">target: getsealeralias
-        </echo>
+        <TGT>getsealeralias</TGT>
         <!--
         <fail if="idp.noprompt">Input needed, silence demanded</fail>
         <input message="Sealer Alias" addproperty="idp.sealer.alias" defaultvalue="secret"/>
@@ -113,8 +113,7 @@
     </target>
 
     <target name="getsource" unless="idp.src.dir">
-        <echo append="true" file="idp_ant.log">target: getsource
-        </echo>
+        <TGT>getsource</TGT>
         <fail if="idp.noprompt">Input needed, silence demanded</fail>
         <input message="Source (Distribution) Directory:" addproperty="idp.src.dir" defaultvalue="${basedir}" />
     </target>
@@ -134,35 +133,30 @@
     </target>
 
     <target name="target-src-default" unless="idp.src.dir.present">
-        <echo append="true" file="idp_ant.log">target: target-src-default
-        </echo>
+        <TGT>target-src-default</TGT>
         <!-- if the source isn't set up then the default is basedir -->
         <property name="idp.target.default" value="${basedir}" />
     </target>
 
     <target name="target-nosrc-default" if="idp.src.dir.present">

[... 240 lines stripped ...]