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

[noreply at shibboleth.net]

Author: rdw
Date: Tue Sep 23 07:27:14 2014
New Revision: 6558

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6558&view=rev
Log:
IDP-469 Run Ant from within the installer for both IdP and Jetty config.  Currently called visible.  QtExec is TBD.

Added:
    trunk/idp-installer/src/main/wix/scripts/shib_write_configs.vbs
Modified:
    trunk/idp-distribution/src/main/resources/bin/build.xml
    trunk/idp-distribution/src/main/resources/bin/jetty.xml
    trunk/idp-installer/src/main/wix/IdP.bat
    trunk/idp-installer/src/main/wix/IdP.sln
    trunk/idp-installer/src/main/wix/ShibbolethIdP-install-dlg.wxs
    trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs

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=6558&r1=6557&r2=6558&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/build.xml (original)
+++ trunk/idp-distribution/src/main/resources/bin/build.xml Tue Sep 23 07:27:14 2014
@@ -35,6 +35,7 @@
         idp.keystore.password:
         idp.merge.properties: The name of a property file to merge with idp.properties.  This file is deleted after processing.
         idp.property.file: The name of a property file to fill in some or all of the above. This file is deleted after processing.
+        idp.no.tidy: Do not delete the two above files (debug only)
         
         The property idp.noprompt will cause a failure rather than a prompt.
     -->
@@ -51,7 +52,7 @@
 
 	<!-- USER INPUT -->
 	<target name="preload" if="idp.property.file">
-	   <property file="$(idp.property.file}"/>
+	   <property file="${idp.property.file}"/>
     </target>
 	<target name="allinput" depends="gettarget, checkproperties, gethostname, geturisubjectaltname, getkeystorepassword, getsealerpassword, getsealeralias, getentityid" />
 
@@ -475,7 +476,7 @@
 		</condition>
 	</target>
 	
-	<target name="tidy">
+	<target name="tidy" unless="idp.no.tidy">
 		<delete file="${idp.merge.properties}" failonerror="false" />
         <delete file="${idp.property.file}" failonerror="false" />
 	</target>

Modified: trunk/idp-distribution/src/main/resources/bin/jetty.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/bin/jetty.xml?rev=6558&r1=6557&r2=6558&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/jetty.xml (original)
+++ trunk/idp-distribution/src/main/resources/bin/jetty.xml Tue Sep 23 07:27:14 2014
@@ -3,7 +3,7 @@
 
     <taskdef resource="net/shibboleth/idp/installer/ant.xml" />
 
-    <target name="install" depends="init, checkini, copyini" />
+    <target name="install" depends="init, checkini, copyinis" />
 
     <target name="init">
         <tstamp />
@@ -14,10 +14,14 @@
         <available property="idp.ini.present" file="jetty-base/start.d/idp.ini" />
     </target>
     
-    <target name="copyini" unless="idp.ini.present">
+	<target name="copyinis" depends="copyidpini"> 
         <mkdir dir="jetty-base/start.d"/>
         <copy file="jetty-base/start.d.dist/jsp.ini" tofile="jetty-base/start.d/jsp.ini" overwrite="false" failonerror="false" />
         <copy file="jetty-base/start.d.dist/jstl.ini" tofile="jetty-base/start.d/jstl.ini" overwrite="false" failonerror="false" />
+	</target>
+	
+    <target name="copyidpini" unless="idp.ini.present">
+        <mkdir dir="jetty-base/start.d"/>
         <mergeproperties inFile="jetty-base/start.d.dist/idp.ini" outFile="jetty-base/start.d/idp.ini" mergeFile="${jetty.merge.properties}" />
     </target>
     

Modified: trunk/idp-installer/src/main/wix/IdP.bat
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/wix/IdP.bat?rev=6558&r1=6557&r2=6558&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/IdP.bat (original)
+++ trunk/idp-installer/src/main/wix/IdP.bat Tue Sep 23 07:27:14 2014
@@ -130,7 +130,7 @@
 "%WIX%/BIN/CANDLE" -nologo -arch x86 -dProjectDir=. ShibbolethIdP-main.wxs ShibbolethIdP-registry.wxs ShibbolethIdP-gui.wxs ShibbolethIdP-install-dlg.wxs ShibbolethIdP-update-dlg.wxs
 if ERRORLEVEL 1 goto done
 
-"%WIX%/BIN/LIGHT" -nologo -out idp.msi -ext WixUIExtension ShibbolethIdP-main.wixobj idp_contents.wixobj ShibbolethIdP-registry.wixobj ShibbolethIdP-gui.wixobj ShibbolethIdP-install-dlg.wixobj ShibbolethIdP-update-dlg.wixobj
+"%WIX%/BIN/LIGHT" -nologo -out idp.msi -ext WixUIExtension ShibbolethIdP-main.wixobj idp_contents.wixobj ShibbolethIdP-registry.wixobj ShibbolethIdP-gui.wixobj ShibbolethIdP-install-dlg.wixobj ShibbolethIdP-update-dlg.wixobj -ext WixUtilExtension.dll
 if ERRORLEVEL 1 goto done
 
 dir idp.msi

Modified: trunk/idp-installer/src/main/wix/IdP.sln

[... 145 lines stripped ...]