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

[noreply at shibboleth.net]

Author: rdw
Date: Tue Sep 16 07:25:35 2014
New Revision: 6532

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6532&view=rev
Log:
Reindent (using Eclipse) so next checkin only shows changes.

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=6532&r1=6531&r2=6532&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:25:35 2014
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="Shibboleth Identity Provider V3" basedir=".." default="install">
 
-  <taskdef resource="net/shibboleth/idp/installer/ant.xml"/>
-	
-  <!-- TODO 
+	<taskdef resource="net/shibboleth/idp/installer/ant.xml" />
+
+	<!-- TODO 
   
     V2 to V3 upgrade
     V3 to V3 , detect if it is V2
     -->
 
-  <!--  TARGETS:
+	<!--  TARGETS:
 
         The following top level targets are implemented.  These in turn call subsidiary targets.
 
@@ -40,382 +40,368 @@
         The property idp.noprompt will cause a failure rather than a prompt.
     -->
 
-  <target name="init">
-    <tstamp/>
-    <hostinfo/>
-  </target>
-
-  <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"/>
-
-  <!-- USER INPUT -->
-  <target name="allinput" depends="gettarget, checkproperties, gethostname, geturisubjectaltname, getkeystorepassword, getsealerpassword, getsealeralias, getentityid" />
-
-  <target name="gethostname" if="idp.ask.hostname" depends="checkproperties">
-    <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">
-    <property name="idp.uri.subject.alt.name" value="https://${idp.host.name}/org/shibboleth/idp"/>
-  </target>
-
-  <target name="getkeystorepassword"  if="idp.ask.keystore.password" depends="checkproperties">
-    <fail if="idp.noprompt">Input needed, silence demanded</fail>
-    <input message="Key Store Password" addproperty="idp.keystore.password"/>
-  </target>
-
-  <target name="getsealerpassword" if="idp.ask.sealer.password" depends="checkproperties">
-    <fail if="idp.noprompt">Input needed, silence demanded</fail>
-    <input message="Sealer Password" addproperty="idp.sealer.password"/>
-  </target>
-
-  <target name="getsealeralias" if="idp.ask.sealer.alias" depends="checkproperties">
-    <fail if="idp.noprompt">Input needed, silence demanded</fail>
-    <input message="Sealer Alias" addproperty="idp.sealer.alias"/>
-  </target>
-
-  <target name="getsource" unless="idp.src.dir" >
-    <fail if="idp.noprompt">Input needed, silence demanded</fail>
-    <input message="Source (Distribution) Directory" addproperty="idp.src.dir" defaultvalue="${basedir}"/>
-  </target>
-
-  <target name="gettarget" depends="target-properties, target-src-default, target-nosrc-default, prompttarget, settarget"/>
-  <target name="target-src-default" unless="idp.src.dir.present">
-    <!-- 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">
-    <!-- if the source is set up then the default must not be basedir -->
-    <property name="idp.target.default" value="/opt/shibboleth/idp"/>
-  </target>
-
-  <target name="prompttarget" if="idp.ask.target">
-    <fail if="idp.noprompt">Input needed, silence demanded</fail>
-    <input message="Target (Install to) Directory" addproperty="idp.target.dir" defaultvalue="${idp.target.default}"/>
-  </target>
-
-  <target name="settarget" if="idp.set.target" >
-    <property name="idp.target.dir" value="${basedir}"/>
-  </target>
-
-  <target name="getentityid" if="idp.ask.entityid" depends="checkproperties">
-    <fail if="idp.noprompt">Input needed, silence demanded</fail>
-    <local name="entityid"/>
-    <input message="EntityID" addproperty="entityid" defaultvalue="https://${idp.host.name}/shibboleth/idp"/>
-    <echo file="replace.properties">idp.entityID=${entityid}</echo>
-    <property name="idp.merge.properties" value="replace.properties"/>
-  </target>
-
-  <!--
+	<target name="init">
+		<tstamp />
+		<hostinfo />
+	</target>
+
+	<target name="install" depends="init, getsource, allinput, copy-distribution, install-nocopy" />

[... 639 lines stripped ...]