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

[noreply at shibboleth.net]

Author: rdw
Date: Mon Sep  1 12:20:23 2014
New Revision: 6492

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6492&view=rev
Log:
IDP-469 Add task to populate the installation tree in the non MSI case

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=6492&r1=6491&r2=6492&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/build.xml (original)
+++ trunk/idp-distribution/src/main/resources/bin/build.xml Mon Sep  1 12:20:23 2014
@@ -1,68 +1,110 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="Shibboleth Identity Provider V3" basedir=".." default="install">
+<project name="Shibboleth Identity Provider V3" basedir=".." default="upgrade">
 
   <taskdef resource="net/shibboleth/idp/installer/ant.xml"/>
-	
-  <!-- We assume some properties set on the command line 
-       idp.src.dir = where the install has been unpacked to
-       idp.target.dir = where we are installing to.  In windows these are the same
-       (because windows has *not* unpacked the conf/view/flows)
-
-       TODO
-       For now hardwire
+
+  <!--  TARGETS:
+
+        The following top level targets are implemented.  These in turn call subsidiary targets.
+
+        install-nocopy:  Does the installation/upgrade on a layout that has been copied (ie, the important
+                         stuff has been copied or overwritten from the distribution.
+        build-war:       Create the war file
+        install:         Copies files from the specified target to the distribution and then
+                         invokes install-nocopy
+        
+        v2upgrade-nocopy: Installs V3 on top of a V2 installation
+        v2upgrade:        Copies files from the specified target to the distribution and
+                          then invokes v2upgrade-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
+        idp.uri.subject.alt.name: If we are creating certificates.  Defaulted
+        idp.sealer.password:
+        idp.sealer.alias:
+        idp.keystore.password:
+        
+        
+        The property idp.noprompt will cause a failure rather than a prompt.
     -->
-
-  <property name="idp.src.dir" value="${basedir}"/>
-  <property name="idp.target.dir" value="${basedir}"/>
 
   <target name="init">
     <tstamp/>
   </target>
 
-  <target name="install" depends="init, genkeys, upgrade, build-war"/>
-  <target name="v2upgrade" depends="init, v2v3prepopulate, install"/>
+  <target name="install" depends="init, gettarget, copy-distribution, install-nocopy"/>
+  <target name="install-nocopy" depends="init, gettarget, genkeys, upgrade, build-war"/>
+  <target name="v2upgrade" depends="init, gettarget, v2v3prepopulate, copy-distribution, install-nocopy"/>
+  <target name="v2upgrade-nocopy" depends="init, gettarget, v2v3prepopulate, install-nocopy"/>
 
   <!-- USER INPUT -->
-  <target name="gethostname" if="idp.ask.for.hostname" depends="checkkeys">
+  <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"/>
   </target>
 
-  <target name="geturisubjectaltname" if="idp.generate.altname" depends="checkkeys">
+  <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="checkkeys">
+  <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="checkkeys">
+  <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="checkkeys">
+  <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>
 

[... 241 lines stripped ...]