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

[noreply at shibboleth.net]

Author: rdw
Date: Mon Apr 27 04:03:46 2015
New Revision: 7486

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7486&view=rev
Log:
IDP-706  If the scope is specified on the command line then we need to make sure it gets written to the merge file

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

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=7486&r1=7485&r2=7486&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/build.xml	(original)
+++ trunk/idp-distribution/src/main/resources/bin/build.xml	Mon Apr 27 04:03:46 2015
@@ -69,7 +69,7 @@
         <TGT>preload</TGT>
         <property file="${idp.property.file}"/>
     </target>
-    <target name="allinput" depends="gettarget, checkproperties, gethostname, getentityid, geturisubjectaltname, setscope, askscope, getkeystorepassword, getsealerpassword, getsealeralias" />
+    <target name="allinput" depends="gettarget, checkproperties, gethostname, getentityid, geturisubjectaltname, setscope, askscope, writescope, getkeystorepassword, getsealerpassword, getsealeralias" />
 
     <target name="gethostname" if="idp.ask.hostname" depends="checkproperties">
         <TGT>gethostname</TGT>
@@ -174,19 +174,20 @@
     <target name="setscope" if="idp.set.scope" depends="checkproperties">
         <TGT>setscope</TGT>
         <property name="idp.scope" value="${DOMAIN}"/>
+    </target>
+
+    <target name="askscope" if="idp.ask.scope" depends="checkproperties">
+        <TGT>askscope</TGT>
+        <input message="Attribute Scope:" addproperty="idp.scope" defaultvalue="${DOMAIN}" />
+    </target>
+
+    <target name="writescope" if="idp.write.scope" depends="setscope, askscope">
+        <TGT>writescope</TGT>
         <echo file="${idp.merge.properties}" append="yes">
            idp.scope=${idp.scope}
         </echo>
     </target>
-
-    <target name="askscope" if="idp.ask.scope" depends="checkproperties">
-        <TGT>askscope</TGT>
-        <input message="Attribute Scope:" addproperty="idp.scope" defaultvalue="${DOMAIN}" />
-        <echo file="${idp.merge.properties}" append="yes">
-           idp.scope=${idp.scope}
-        </echo>
-    </target>
-
+    
     <!--
      KEY MANAGEMENT
     -->
@@ -260,6 +261,15 @@
                 <isset property="idp.noprompt" />
                 <isfalse value="${idp.properties.present}" />
             </and>
+        </condition>
+
+        <condition property="idp.write.scope">
+            <!-- We write the scope if we set it, ask for it, or if its supplied -->
+            <or>
+                <isset property="idp.scope" />
+                <isset property="idp.ask.scope" />
+                <isset property="idp.write.scope" />
+            </or>
         </condition>
 
         <condition property="idp.generate.altname">