[java-identity-provider COMMIT] in /trunk/idp-distribution/src/main/resources/bin: build.bat build.sh build.xml insta...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Nov 14 22:18:16 2014
New Revision: 6906

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6906&view=rev
Log:
Improve installer prompts, add install and build wrappers.

Added:
    trunk/idp-distribution/src/main/resources/bin/build.bat   (with props)
    trunk/idp-distribution/src/main/resources/bin/build.sh   (with props)
    trunk/idp-distribution/src/main/resources/bin/install.bat   (with props)
    trunk/idp-distribution/src/main/resources/bin/install.sh   (with props)
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=6906&r1=6905&r2=6906&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/build.xml (original)
+++ trunk/idp-distribution/src/main/resources/bin/build.xml Fri Nov 14 22:18:16 2014
@@ -69,7 +69,7 @@
 		<echo append="true" file="idp_ant.log">target: gethostname
 		</echo>
 		<fail if="idp.noprompt">Input needed, silence demanded</fail>
-		<input message="Hostname" addproperty="idp.host.name" defaultvalue="${NAME}.${DOMAIN}" />
+		<input message="Hostname: " addproperty="idp.host.name" defaultvalue="${NAME}.${DOMAIN}" />
 	</target>
 
 	<target name="geturisubjectaltname" if="idp.generate.altname" depends="checkproperties, gethostname">
@@ -82,7 +82,7 @@
 		<echo append="true" file="idp_ant.log">target: getkeystorepassword
 		</echo>
 		<fail if="idp.noprompt">Input needed, silence demanded</fail>
-		<input message="Key Store Password" addproperty="idp.keystore.password">
+		<input message="TLS Private Key Password: " addproperty="idp.keystore.password">
 			<handler classname="net.shibboleth.idp.installer.ant.PasswordHandler"/>
 	    </input>
 	</target>
@@ -91,7 +91,7 @@
 		<echo append="true" file="idp_ant.log">target: getsealerpassword
 		</echo>
 		<fail if="idp.noprompt">Input needed, silence demanded</fail>
-		<input message="Sealer Password" addproperty="idp.sealer.password">
+		<input message="Cookie Encryption Key Password: " addproperty="idp.sealer.password">
             <handler classname="net.shibboleth.idp.installer.ant.PasswordHandler"/>
         </input>
         <echo file="${idp.merge.properties}" append="yes">
@@ -116,7 +116,7 @@
 		<echo append="true" file="idp_ant.log">target: getsource
 		</echo>
 		<fail if="idp.noprompt">Input needed, silence demanded</fail>
-		<input message="Source (Distribution) Directory" addproperty="idp.src.dir" defaultvalue="${basedir}" />
+		<input message="Source (Distribution) Directory: " addproperty="idp.src.dir" defaultvalue="${basedir}" />
 	</target>
 
 	<target name="gettarget" depends="target-properties, setmerge, setservicemerge, target-src-default, target-nosrc-default, prompttarget, settarget" />
@@ -151,7 +151,7 @@
 		<echo append="true" file="idp_ant.log">target: prompttarget
 		</echo>
 		<fail if="idp.noprompt">Input needed, silence demanded</fail>
-		<input message="Target (Install to) Directory" addproperty="idp.target.dir" defaultvalue="${idp.target.default}" />
+		<input message="Install to Directory: " addproperty="idp.target.dir" defaultvalue="${idp.target.default}" />
 	</target>
 
 	<target name="settarget" if="idp.set.target">
@@ -165,7 +165,7 @@
 		</echo>
 		<fail if="idp.noprompt">Input needed, silence demanded</fail>
 		<local name="entityid" />
-		<input message="EntityID" addproperty="entityid" defaultvalue="https://${idp.host.name}/idp/shibboleth" />
+		<input message="SAML EntityID: " addproperty="entityid" defaultvalue="https://${idp.host.name}/idp/shibboleth" />
         <echo file="${idp.merge.properties}" append="yes">
 			idp.entityID=${entityid}
 		</echo>
@@ -183,16 +183,14 @@
     <target name="askscope" if="idp.ask.scope" depends="checkproperties">
 		<echo append="true" file="idp_ant.log">target: askscope
 		</echo>
-		<input message="Attribute Scope" addproperty="idp.scope" defaultvalue="${DOMAIN}" />
+		<input message="Attribute Scope: " addproperty="idp.scope" defaultvalue="${DOMAIN}" />
 		<echo file="${idp.merge.properties}" append="yes">
 		   idp.scope=${idp.scope}
 		</echo>
     </target>
 	
 	<!--
-
      KEY MANAGEMENT
-
     -->
 
 	<target name="genkeys" depends="init, preload, checkproperties, signing-key, encryption-key, backchannel-key, sealer" />
@@ -368,39 +366,41 @@
 	<target name="signing-key" unless="idp.relying.party.present" depends="gethostname, geturisubjectaltname">
 		<echo append="true" file="idp_ant.log">target: signing-key
 		</echo>
-		<echo>Creating Signing Key, hostname ${idp.host.name} URI = ${idp.uri.subject.alt.name}</echo>
+		<echo>Generating Signing Key, CN = ${idp.host.name} URI = ${idp.uri.subject.alt.name} ...</echo>
         <mkdir dir="${idp.target.dir}/credentials"/>

[... 91 lines stripped ...]