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

[noreply at shibboleth.net]

Author: rdw
Date: Tue Oct 14 06:36:30 2014
New Revision: 6688

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6688&view=rev
Log:
IDP-469 More debugging.  Strip trailing backslash from ANT_HOME in ant.bat.  Add logging (logging file deleted on success) to assist target debug.  Move V2V3preopulate forward in the full copy install. involved bring gettarget forward as well.

Modified:
    trunk/idp-distribution/src/main/resources/bin/ant.bat
    trunk/idp-distribution/src/main/resources/bin/build.xml

Modified: trunk/idp-distribution/src/main/resources/bin/ant.bat
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/bin/ant.bat?rev=6688&r1=6687&r2=6688&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/ant.bat (original)
+++ trunk/idp-distribution/src/main/resources/bin/ant.bat Tue Oct 14 06:36:30 2014
@@ -3,6 +3,11 @@
 
 REM Find the necessary resources
 set ANT_HOME=%~dp0
+
+REM strip trailing backslash - it confuses java
+if "%ANT_HOME:~-1%" == "\" (
+  set ANT_HOME=%ANT_HOME:~0,-1%
+)
 
 REM We need a JVM
 if not defined JAVA_HOME  (

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=6688&r1=6687&r2=6688&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/build.xml (original)
+++ trunk/idp-distribution/src/main/resources/bin/build.xml Tue Oct 14 06:36:30 2014
@@ -41,32 +41,44 @@
 	<target name="init">
 		<tstamp />
 		<hostinfo />
-	</target>
-
-	<target name="install" depends="init, preload, getsource, allinput, copy-distribution, install-nocopy, tidy" />
+		<echo append="true" file="idp_ant.log">target: Init
+		</echo>
+	</target>
+
+	<target name="install" depends="init, preload, getsource, gettarget, v2v3prepopulate, allinput, copy-distribution, install-nocopy, tidy" />
 	<target name="install-nocopy" depends="init, preload, gettarget, v2v3prepopulate, allinput, genkeys, upgrade, metadata-gen, 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, geturisubjectaltname, getkeystorepassword, getsealerpassword, getsealeralias, getentityid, setscope, askscope" />
 
 	<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">
+		<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="Key Store Password" addproperty="idp.keystore.password" />
 	</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="Sealer Password" addproperty="idp.sealer.password" />
         <echo file="replace.properties" append="yes">
@@ -79,6 +91,8 @@
 	</target>
 
 	<target name="getsealeralias" if="idp.ask.sealer.alias" depends="checkproperties">
+		<echo append="true" file="idp_ant.log">target: getsealeralias
+		</echo>
 		<!-- 
 		<fail if="idp.noprompt">Input needed, silence demanded</fail>
 		<input message="Sealer Alias" addproperty="idp.sealer.alias" defaultvalue="secret"/>
@@ -87,31 +101,43 @@
 	</target>
 
 	<target name="getsource" unless="idp.src.dir">
+		<echo append="true" file="idp_ant.log">target: getsource
+		</echo>
 		<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">
+		<echo append="true" file="idp_ant.log">target: target-src-default
+		</echo>
 		<!-- if the source isn't set up then the default is basedir -->
 		<property name="idp.target.default" value="${basedir}" />
 	</target>
 

[... 192 lines stripped ...]