[java-identity-provider] branch master updated: Fix some trailing whitespace and indentation

[Ian Young]

This is an automated email from the git hooks/post-receive script.

iay pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=720c0d461d271bd9cb5f09efc94022f044a65cdb

The following commit(s) were added to refs/heads/master by this push:
       new  720c0d4   Fix some trailing whitespace and indentation
720c0d4 is described below

commit 720c0d461d271bd9cb5f09efc94022f044a65cdb
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Wed Sep 26 09:58:36 2018 +0100

    Fix some trailing whitespace and indentation
---
 idp-distribution/src/main/resources/bin/build.xml | 40 +++++++++++------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/idp-distribution/src/main/resources/bin/build.xml b/idp-distribution/src/main/resources/bin/build.xml
index 3c03eca..279830f 100644
--- a/idp-distribution/src/main/resources/bin/build.xml
+++ b/idp-distribution/src/main/resources/bin/build.xml
@@ -28,7 +28,7 @@
         idp.sealer.password:
         idp.sealer.alias:
         idp.keystore.password:
-        idp.keysize: to change from the the default of 3072 
+        idp.keysize: to change from the the default of 3072
         idp.scope: The scope to assert.  If present this should also be present in idp.merge.properties
         idp.merge.properties: The name of a property file to merge with idp.properties.  This file only
           used when doing the initial create of idp.properties, and is deleted after processing
@@ -46,7 +46,7 @@
         ldap.merge.properties:  The name of a property file to merge with ldap.properties
         idp.conf.filemode (default "600"): The permissions to mark the files in conf with (UNIX only).
         idp.conf.credentials.filemode (default "600"): The permissions to mark the files in conf with (UNIX only).
-        
+
 
         The property idp.noprompt will cause a failure rather than a prompt.
     -->
@@ -166,20 +166,20 @@
         <TGT>settarget</TGT>
         <property name="idp.target.dir" value="${basedir}" />
     </target>
-	
-	<target name="askentityId" if="idp.ask.entityid" depends="checkproperties">
+
+    <target name="askentityId" if="idp.ask.entityid" depends="checkproperties">
         <TGT>askentityId</TGT>
         <fail if="idp.noprompt">Input needed, silence demanded</fail>
         <input message="SAML EntityID:" addproperty="idp.entityID" defaultvalue="https://${idp.host.name}/idp/shibboleth" />
         <property name="idp.uri.subject.alt.name" value="${idp.entityID}" />
-	</target>
-	
+    </target>
+
     <target name="writeentityId" if="idp.write.entityid" depends="askentityId, checkproperties">
         <echo file="${idp.merge.properties}" append="yes">
             idp.entityID=${idp.entityID}
         </echo>
     </target>
-	
+
     <target name="getentityid" depends="checkproperties, askentityId, writeentityId"/>
 
     <target name="setscope" if="idp.set.scope" depends="checkproperties">
@@ -231,7 +231,7 @@
         </condition>
 
         <condition property="idp.ask.entityid">
-            <!-- Ask for EntityID if 
+            <!-- Ask for EntityID if
                          - The merge properties file (which has to contain
                                             it if it is present) wasn't provided   AND
                          - This is not an upgrade                                  AND
@@ -243,24 +243,24 @@
                 <not>
                     <istrue value="${idp.properties.present}" />
                 </not>
-            	<not>
-            		<istrue value="${idp.entityID.present}" />
-            	</not>
+                <not>
+                    <istrue value="${idp.entityID.present}" />
+                </not>
             </and>
         </condition>
-    	
-    	<condition property="idp.write.entityid">
-    		<!-- Do we write it to merge properties?  If
+
+        <condition property="idp.write.entityid">
+            <!-- Do we write it to merge properties?  If
                          - The merge properties file (which has to contain
                                             it if it is present) wasn't provided   AND
                          - This is not an upgrade                                  AND
                          - It was provided on the command line
                  This is the same as saying "all the cases where we ould ask, plus if its present" -->
-    		<or>
-    			<istrue value="${idp.ask.entityid}" />
+            <or>
+                <istrue value="${idp.ask.entityid}" />
                 <istrue value="${idp.entityID.present}" />
-    		</or>
-    	</condition>
+            </or>
+        </condition>
 
         <condition property="idp.ask.hostname">
             <!-- We ask for host name if there is no host name and we will call certgen or ask for entityID -->
@@ -397,12 +397,12 @@
         <condition property="idp.src.dir.present">
             <isset property="idp.src.dir" />
         </condition>
-    		
+
         <condition property="idp.entityID.present">
             <!-- capture now before it is overwritten -->
             <isset property="idp.entityID" />
         </condition>
-    	
+
         <condition property="idp.merge.properties.present">
             <isset property="idp.merge.properties" />
         </condition>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.