[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: Thu Sep 25 07:31:43 2014
New Revision: 6573

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6573&view=rev
Log:
IDP-469 More jetty configuration - make it possible to stop the service.  Add more config from the ant file.  Add 64 and 32 bit installers.  Automatically detect a V2 upgrade in the ant scripts.  Placeholder action for metadata generation

Added:
    trunk/idp-installer/src/main/wix/scripts/shib_random.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/java/net/shibboleth/idp/installer/PropertiesWithComments.java
    trunk/idp-installer/src/main/wix/IdP.bat
    trunk/idp-installer/src/main/wix/IdP.sln
    trunk/idp-installer/src/main/wix/Jetty.bat
    trunk/idp-installer/src/main/wix/MergeModule.wxs
    trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
    trunk/idp-installer/src/main/wix/ShibbolethIdP-registry.wxs
    trunk/idp-installer/src/main/wix/procrun.wxs
    trunk/idp-installer/src/main/wix/scripts/shib_is_v2.vbs-wix
    trunk/idp-installer/src/main/wix/scripts/shib_write_configs.vbs

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=6573&r1=6572&r2=6573&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/build.xml (original)
+++ trunk/idp-distribution/src/main/resources/bin/build.xml Thu Sep 25 07:31:43 2014
@@ -3,25 +3,18 @@
 
 	<taskdef resource="net/shibboleth/idp/installer/ant.xml" />
 
-	<!-- TODO 
-       V3 to V3 , detect if it is V2
-    -->
-
 	<!--  TARGETS:
 
-        The following top level targets are implemented.  These in turn call subsidiary targets.
+        The following top level targets are implemented and supported.  These in turn call subsidiary targets,
+        whose use outside this file is not supported.
 
         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.
+                         stuff has been copied or overwritten from the distribution)
+                         A V2 upgrade will be performed if a V2 site is detected.
         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.
@@ -46,9 +39,7 @@
 	</target>
 
 	<target name="install" depends="init, preload, getsource, allinput, copy-distribution, install-nocopy, tidy" />
-	<target name="install-nocopy" depends="init, preload, allinput, genkeys, upgrade, build-war, tidy" />
-	<target name="v2upgrade" depends="init, preload, gettarget, v2v3prepopulate, getsource, allinput,copy-distribution, install-nocopy, tidy" />
-	<target name="v2upgrade-nocopy" depends="init, preload, gettarget, v2v3prepopulate, allinput, install-nocopy, tidy" />
+	<target name="install-nocopy" depends="init, preload,  gettarget, v2v3prepopulate, allinput, genkeys, upgrade, build-war, tidy" />
 
 	<!-- USER INPUT -->
 	<target name="preload" if="idp.property.file">
@@ -138,6 +129,7 @@
 		<available property="idp.encryption.present" file="${idp.target.dir}/creds/idp-encryption.crt" />
 		<available property="idp.p12.keystore.present" file="${idp.target.dir}/creds/idp-tls.p12" />
 		<available property="idp.jks.keystore.present" file="${idp.target.dir}/creds/idp-tls.jks" />
+        <available property="idp.metadata.present" file="${idp.target.dir}/metadata/idp-metadata.xml" />
 		<condition property="idp.keystore.present">
 			<or>
 				<istrue value="${idp.p12.keystore.present}" />
@@ -293,7 +285,7 @@
 
     -->
 
-	<target name="upgrade" depends="editproperties">
+	<target name="upgrade" depends="editproperties, metadata-gen">
 		<!-- Create edit-webapp -->
         <mkdir dir="${idp.target.dir}/edit-webapp" />
         <mkdir dir="${idp.target.dir}/edit-webapp/WEB-INF" />
@@ -335,6 +327,12 @@
 		<mkdir dir="${idp.target.dir}/conf" />
 		<mergeproperties inFile="${idp.target.dir}/dist/conf/idp.properties.dist" outFile="${idp.target.dir}/conf/idp.properties" mergeFile="${idp.merge.properties}" />
 	</target>
+	
+	<target name="metadata-gen" depends="gettarget, getentityid, gethostname"  unless="idp.metadata.present">
+	   <echo file="${idp.target.dir}/metadata/idp-metadata.xml">
+	Metadata !
+	   	</echo>
+	</target>
 
 	<!--
 
@@ -431,9 +429,13 @@
 

[... 527 lines stripped ...]