[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: Mon Sep 22 11:01:10 2014
New Revision: 6550

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6550&view=rev
Log:
IDP-469 Checkpoint work in Windows (and non Windows) Installer

- Fix bugs in merging values into of idp.propoerties
- Fix many (but not all) bugs in setting up sealer
- Fix missing in directory creation
- Separate SSO keystore for TLS keystore in Jetty canned configuration
- Start to wire in jetty into installer
  - ini only configuration
  - Add UMSS from Apache to run the container in
  - Add the UMSS to the jetty merge module
- Misc wix changes/bugfixes

Added:
    trunk/idp-installer/src/main/wix/procrun.wxs
    trunk/idp-installer/src/main/wix/shib.ico   (with props)
Modified:
    trunk/idp-distribution/src/main/resources/bin/build.xml
    trunk/idp-distribution/src/main/resources/jetty-base/etc/jetty-deploy.xml
    trunk/idp-distribution/src/main/resources/jetty-base/etc/jetty.xml
    trunk/idp-distribution/src/main/resources/jetty-base/start.d/idp.ini
    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/Jetty.bat
    trunk/idp-installer/src/main/wix/Jetty.wixproj
    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/scripts/shib_is_v2.vbs-wix

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=6550&r1=6549&r2=6550&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/build.xml (original)
+++ trunk/idp-distribution/src/main/resources/bin/build.xml Mon Sep 22 11:01:10 2014
@@ -70,11 +70,21 @@
 	<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" />
+        <echo file="replace.properties" append="yes">
+        	idp.sealer.storePassword=${idp.sealer.password}
+        </echo>
+        <echo file="replace.properties" append="yes">
+        	idp.sealer.keyPassword=${idp.sealer.password}
+        </echo>
+        <property name="idp.merge.properties" value="replace.properties" />
 	</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" />
+		<!-- 
+		<fail if="idp.noprompt">Input needed, silence demanded</fail>
+		<input message="Sealer Alias" addproperty="idp.sealer.alias" defaultvalue="secret"/>
+		-->
+		<property name="idp.sealer.alias" value="secret"/>
 	</target>
 
 	<target name="getsource" unless="idp.src.dir">
@@ -106,7 +116,9 @@
 		<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>
+		<echo file="replace.properties" append="yes">
+			idp.entityID=${entityid}
+		</echo>
 		<property name="idp.merge.properties" value="replace.properties" />
 	</target>
 
@@ -117,7 +129,7 @@
     -->
 
 	<target name="genkeys" depends="init, checkproperties, signing-key, encryption-key, keystore, sealer" />
-
+ 
 	<target name="checkproperties" depends="gettarget">
 		<available property="idp.signing.present" file="${idp.target.dir}/creds/idp-signing.crt" />
 		<available property="idp.encryption.present" file="${idp.target.dir}/creds/idp-encryption.crt" />
@@ -250,21 +262,25 @@
 
 	<target name="signing-key" unless="idp.signing.present" depends="gethostname, geturisubjectaltname">
 		<echo>Creating Signing Key, hostname ${idp.host.name} URI = ${idp.uri.subject.alt.name}</echo>
+        <mkdir dir="${idp.target.dir}/creds"/>
 		<selfsignedcert hostname="${idp.host.name}" privateKeyFile="${idp.target.dir}/creds/idp-signing.key" certificateFile="${idp.target.dir}/creds/idp-signing.crt" uriSubjectAltNames="${idp.uri.subject.alt.name}" />
 	</target>
 
 	<target name="encryption-key" unless="idp.encryption.present" depends="gethostname, geturisubjectaltname">
 		<echo>Creating Encryption Key, hostname ${idp.host.name} URI = ${idp.uri.subject.alt.name}</echo>
+        <mkdir dir="${idp.target.dir}/creds"/>
 		<selfsignedcert hostname="${idp.host.name}" privateKeyFile="${idp.target.dir}/creds/idp-encryption.key" certificateFile="${idp.target.dir}/creds/idp-encryption.crt" uriSubjectAltNames="${idp.uri.subject.alt.name}" />
 	</target>
 
 	<target name="keystore" unless="idp.keystore.present" depends="getkeystorepassword, gethostname, geturisubjectaltname">

[... 418 lines stripped ...]