[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: Wed Sep 24 08:11:24 2014
New Revision: 6563

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6563&view=rev
Log:
IDP-469 Config Jetty and create its browser certificate.    Move setting of IDP specific Jetty parameterization into IdP (from jetty merge module).  Tested that a deployed IdP responds as IdP/Status

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/ant/MergeProperties.java
    trunk/idp-installer/src/main/wix/ShibbolethIdP-install-dlg.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/build.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/bin/build.xml?rev=6563&r1=6562&r2=6563&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/build.xml (original)
+++ trunk/idp-distribution/src/main/resources/bin/build.xml Wed Sep 24 08:11:24 2014
@@ -294,6 +294,9 @@
     -->
 
 	<target name="upgrade" depends="editproperties">
+		<!-- Create edit-webapp -->
+        <mkdir dir="${idp.target.dir}/edit-webapp" />
+        <mkdir dir="${idp.target.dir}/edit-webapp/WEB-INF" />
 		<!-- conf -->
 		<mkdir dir="${idp.target.dir}/conf" />
 		<copy todir="${idp.target.dir}/conf">
@@ -407,7 +410,7 @@
 		<copy todir="${idp.target.dir}/doc">
 			<fileset dir="${idp.src.dir}/doc" />
 		</copy>
-		<mkdir dir="${idp.target.dir}/edit-webapp" />
+		    	
 		<mkdir dir="${idp.target.dir}/flows" />
 		<copy todir="${idp.target.dir}/jetty-base">
 			<fileset dir="${idp.src.dir}/jetty-base" />

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=6563&r1=6562&r2=6563&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/jetty.xml (original)
+++ trunk/idp-distribution/src/main/resources/bin/jetty.xml Wed Sep 24 08:11:24 2014
@@ -1,33 +1,65 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="Shibboleth IdP V3 - Jetty Container" basedir=".." default="install">
 
-    <taskdef resource="net/shibboleth/idp/installer/ant.xml" />
+	<taskdef resource="net/shibboleth/idp/installer/ant.xml" />
 
-    <target name="install" depends="init, checkini, copyinis" />
+	<target name="install" depends="init, properties, keystores, copyinis, tidy" />
 
-    <target name="init">
-        <tstamp />
-        <hostinfo />
-    </target>
+	<target name="init">
+		<tstamp />
+		<hostinfo />
+	</target>
 
-    <target name="checkini">
-        <available property="idp.ini.present" file="jetty-base/start.d/idp.ini" />
-    </target>
-    
-	<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 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.tls.jks.present" file="${idp.target.dir}/creds/idp-tls.jks" />
+		<available property="idp.ssl.jks.present" file="${idp.target.dir}/creds/idp-ssl.jks" />
+		<available property="idp.ssl.p12.present" file="${idp.target.dir}/creds/idp-ssl.p12" />
+		<condition property="generate.ssl.p12">
+			<!-- Generate the pkcs12 keystore if neither the JKS nor the P12 exist -->
+			<not>
+				<and>
+					<istrue value="${idp.ssl.jks.present}" />
+					<istrue value="${idp.ssl.p12.present}" />
+				</and>
+			</not>
+		</condition>
 	</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>
-    
-    <target name="tidy">
-        <delete file="${jetty.merge.properties}" failonerror="false" />
-    </target>
-    
+
+	<!-- Handle keystores -->
+	<target name="keystores" depends="tls-jks, ssl-jks, gen-ssl" />
+
+	<target name="tls-jks" if="idp.tls.jks.present">
+		<echo file="${jetty.merge.properties}" append="yes">
+    		jetty.backchannel.keystore.type=JKS
+    	</echo>
+	</target>
+
+	<target name="ssl-jks" if="idp.ssl.jks.present">
+		<echo append="true" file="${jetty.merge.properties}">
+            jetty.browser.keystore.type=JKS
+        </echo>
+	</target>
+
+	<target name="gen-ssl" if="generate.ssl.p12">

[... 186 lines stripped ...]