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

[noreply at shibboleth.net]

Author: iay
Date: Thu Jan  1 11:05:39 2015
New Revision: 7227

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7227&view=rev
Log:
Fix white space and indentation throughout.

Modified:
    trunk/idp-distribution/src/main/resources/bin/ant-jetty.xml

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=7227&r1=7226&r2=7227&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/ant-jetty.xml (original)
+++ trunk/idp-distribution/src/main/resources/bin/ant-jetty.xml Thu Jan  1 11:05:39 2015
@@ -1,75 +1,75 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="Shibboleth IdP V3 - Jetty Container" basedir=".." default="install">
-	
-	<!--  This file is for automatic configuration of Jetty, primarily from THE MSI installer.
-	
-	   Names and APIS *may* change in thre future, please enter an RFI if you wish to use this
-	   in production outside the MSI installer.
-	
-	
-	TARGETS:
 
-	        The following top level target is.  This in turn calls subsidiary targets.
+    <!--  This file is for automatic configuration of Jetty, primarily from THE MSI installer.
 
-	        install:         
-	        
-	        PROPERTIES:
-	        The following properties are used.  They have to be provided on the command line or
-	        via the property file.
-	        
-	        jetty.property.file: Name of a file to fill in all or some of the below. This file is deleted after processing.
+       	Names and APIS *may* change in thre future, please enter an RFI if you wish to use this
+       	in production outside the MSI installer.
+
+        TARGETS:
+
+        	The following top level target is.  This in turn calls subsidiary targets.
+
+       		install:
+
+        PROPERTIES:
+
+            The following properties are used.  They have to be provided on the command line or
+            via the property file.
+
+            jetty.property.file: Name of a file to fill in all or some of the below. This file is deleted after processing.
             jetty.merge.properties: The name of a property file to merge with idp.ini.  This file is deleted after processing.
             idp.host.name: The host name.
             idp.uri.subject.alt.name: If we are creating certificates.
-            idp.target.dir: where to install to. 
+            idp.target.dir: where to install to.
             idp.keystore.password: password to use on the created keystore (this value must also have been written to the merge properties file
-	        jetty.no.tidy: Do not delete the two above files (debug only)
-	        
-	    -->
+            jetty.no.tidy: Do not delete the two above files (debug only)
 
-	<taskdef resource="net/shibboleth/idp/installer/ant.xml" />
+    -->
 
-	<target name="install" depends="init, properties, keystores, directories, copyinis, reprotect, tidy" />
+    <taskdef resource="net/shibboleth/idp/installer/ant.xml" />
 
-	<target name="init">
-		<tstamp />
-		<hostinfo />
-	</target>
+    <target name="install" depends="init, properties, keystores, directories, copyinis, reprotect, tidy" />
 
-	<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.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.jks.present}" />
-					<istrue value="${idp.userfacing.p12.present}" />
-				</or>
-			</not>
-		</condition>
-	</target>
+    <target name="init">
+        <tstamp />
+        <hostinfo />
+    </target>
 
-	<!-- Handle keystores -->
-	<target name="keystores" depends="jks, gen-userfacing" />
+    <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.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.jks.present}" />
+                    <istrue value="${idp.userfacing.p12.present}" />
+                </or>
+            </not>
+        </condition>
+    </target>
 
-	<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. -->

[... 84 lines stripped ...]