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

[noreply at shibboleth.net]

Author: rdw
Date: Sat Nov  8 09:28:40 2014
New Revision: 6866

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6866&view=rev
Log:
IDP-251 Make life much more wonderful for Quick Installer users - inherit installation dir, turn on Jetty and AD config and inherit keystore if we find an old QI install

Modified:
    trunk/idp-distribution/src/main/resources/bin/ant-jetty.xml
    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

Modified: trunk/idp-distribution/src/main/resources/bin/ant-jetty.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/bin/ant-jetty.xml?rev=6866&r1=6865&r2=6866&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/ant-jetty.xml (original)
+++ trunk/idp-distribution/src/main/resources/bin/ant-jetty.xml Sat Nov  8 09:28:40 2014
@@ -39,14 +39,13 @@
 	<target name="properties">
 		<property file="${jetty.property.file}" />
 		<available property="idp.ini.present" file="${idp.target.dir}/jetty-base/start.d/idp.ini" />
-		<available property="idp.backchannel.jks.present" file="${idp.target.dir}/credentials/idp-backchannel.jks" />
-		<available property="idp.userfacing.jks.present" file="${idp.target.dir}/credentials/idp-userfacing.jks" />
+		<available property="idp.jks.present" file="${idp.target.dir}/credentials/idp.jks" />
 		<available property="idp.userfacing.p12.present" file="${idp.target.dir}/credentials/idp-userfacing.p12" />
 		<condition property="generate.userfacing.p12">
 			<!-- Generate the pkcs12 keystore if neither the JKS nor the P12 exist -->
 			<not>
 				<or>
-					<istrue value="${idp.userfacing.jks.present}" />
+					<istrue value="${idp.jks.present}" />
 					<istrue value="${idp.userfacing.p12.present}" />
 				</or>
 			</not>
@@ -54,18 +53,18 @@
 	</target>
 
 	<!-- Handle keystores -->
-	<target name="keystores" depends="backchannel-jks, userfacing-jks, gen-userfacing" />
+	<target name="keystores" depends="jks, gen-userfacing" />
 
-	<target name="backchannel-jks" if="idp.backchannel.jks.present">
-		<echo file="${jetty.merge.properties}" append="yes">
-    		jetty.backchannel.keystore.type=JKS
+	<target name="jks" if="idp.jks.present">
+	  <!-- Note that this password is the old default for QI.  This will overwrite what we may have put in when the merge file was created. -->
+	  <echo file="${jetty.merge.properties}" append="yes">
+    	    jetty.backchannel.keystore.type=JKS
+            jetty.browser.keystore.type=JKS
+	    jetty.backchannel.keystore.password= SeCrEt
+	    jetty.browser.keystore.password= SeCrEt
+	    jetty.backchannel.keystore.path= ${idp.target.dir}/credentials/idp.jks
+	    jetty.browser.keystore.path= ${idp.target.dir}/credentials/idp.jks
     	</echo>
-	</target>
-
-	<target name="userfacing-jks" if="idp.userfacing.jks.present">
-		<echo append="true" file="${jetty.merge.properties}">
-            jetty.browser.keystore.type=JKS
-        </echo>
 	</target>
 
 	<target name="gen-userfacing" if="generate.userfacing.p12">

Modified: trunk/idp-installer/src/main/wix/MergeModule.wxs
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/wix/MergeModule.wxs?rev=6866&r1=6865&r2=6866&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/MergeModule.wxs (original)
+++ trunk/idp-installer/src/main/wix/MergeModule.wxs Sat Nov  8 09:28:40 2014
@@ -17,7 +17,7 @@
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 	<Module Id="Jetty" Language="1033" Version="1.0.0.3">
-		<Package Id="684b3207-0d64-43e6-9e6a-3acb8b7672d7" Manufacturer="Shibboleth Consortium" InstallerVersion="310" Description="Merge Module for Jetty"
+		<Package Id="684b3207-0d64-43e6-9e6a-3acb8b7672d7" Manufacturer="The Shibboleth Consortium" InstallerVersion="310" Description="Merge Module for Jetty"
 			 Comments="This module is built by the Shibboleth Consortium.  Includes Jetty (from Eclipse) and Procrun (from Apache)"
 			 Platform="$(var.msitype)"/>
 		<Directory Id="TARGETDIR" Name="SourceDir">

Modified: trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs?rev=6866&r1=6865&r2=6866&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs (original)
+++ trunk/idp-installer/src/main/wix/ShibbolethIdP-main.wxs Sat Nov  8 09:28:40 2014
@@ -19,8 +19,8 @@
 
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="*" Name="Shibboleth IdP V3" Language="1033" Version="3.0.0.3" Manufacturer="Shibboleth Consortium" UpgradeCode="$(var.UpgradeUUID)">

[... 115 lines stripped ...]