[java-identity-provider COMMIT] in /trunk: idp-distribution/src/main/resources/bin/ant.bat idp-distribution/src/main/...

[noreply at shibboleth.net]

Author: rdw
Date: Fri Aug 29 13:01:43 2014
New Revision: 6485

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6485&view=rev
Log:
IDP 469 Sealer Generation on install.   More complexity on when to prompt so as to be as silent as possible in the non-interactive case.

Added:
    trunk/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/BasicKeystoreKeyStrategyTask.java   (with props)
Modified:
    trunk/idp-distribution/src/main/resources/bin/ant.bat
    trunk/idp-distribution/src/main/resources/bin/ant.sh
    trunk/idp-distribution/src/main/resources/bin/build.xml

Modified: trunk/idp-distribution/src/main/resources/bin/ant.bat
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/bin/ant.bat?rev=6485&r1=6484&r2=6485&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/ant.bat (original)
+++ trunk/idp-distribution/src/main/resources/bin/ant.bat Fri Aug 29 13:01:43 2014
@@ -29,6 +29,11 @@
 	call %ANT_HOME%\cpappend.bat %%i
 )
 
+for %%i in (%ANT_HOME%\..\war\WEB-INF\lib\*.jar) do (
+	call %ANT_HOME%\cpappend.bat %%i
+)
+
+
 if exist %JAVA_HOME%\lib\tools.jar (
     set LOCALCLASSPATH=%LOCALCLASSPATH%;%JAVA_HOME%\lib\tools.jar
 )
@@ -37,4 +42,4 @@
     set LOCALCLASSPATH=%LOCALCLASSPATH%;%JAVA_HOME%\lib\classes.zip
 )
 
-%JAVACMD% -cp "%LOCALCLASSPATH%" -Dant.home="%ANT_HOME%" %ANT_OPTS% org.apache.tools.ant.Main -e -f %ANT_home%/build.xml %*
+%JAVACMD% -cp "%LOCALCLASSPATH%" -Dant.home="%ANT_HOME%" %ANT_OPTS% org.apache.tools.ant.Main -e -f %ANT_home%/build.xml %*

Modified: trunk/idp-distribution/src/main/resources/bin/ant.sh
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/bin/ant.sh?rev=6485&r1=6484&r2=6485&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/ant.sh (original)
+++ trunk/idp-distribution/src/main/resources/bin/ant.sh Fri Aug 29 13:01:43 2014
@@ -49,6 +49,20 @@
     fi
 done
 
+WEBINFLIBS=${ANT_HOME}/lib/*.jar
+for i in ${WEBINFLIBS}
+do
+    # if the directory is empty, then it will return the input string
+    # this is stupid, so case for it
+    if [ "$i" != "${WEBINFLIBS}" ] ; then
+      if [ -z "$LOCALCLASSPATH" ] ; then
+        LOCALCLASSPATH=$i
+      else
+        LOCALCLASSPATH="$i":$LOCALCLASSPATH
+      fi
+    fi
+done
+
 if [ -n "$JAVA_HOME" ] ; then
   if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then
     LOCALCLASSPATH=$LOCALCLASSPATH:$JAVA_HOME/lib/tools.jar

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=6485&r1=6484&r2=6485&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/build.xml (original)
+++ trunk/idp-distribution/src/main/resources/bin/build.xml Fri Aug 29 13:01:43 2014
@@ -23,19 +23,27 @@
   <target name="v2upgrade" depends="init, v2v3prepopulate, install"/>
 
   <!-- USER INPUT -->
-  <target name="gethostname" unless="idp.host.name">
+  <target name="gethostname" if="idp.ask.for.hostname" depends="checkkeys">
     <input message="Hostname" addproperty="idp.host.name"/>
   </target>
 
-  <target name="geturisubjectaltname" unless="uri.subject.alt.name">
+  <target name="geturisubjectaltname" if="idp.generate.altname" depends="checkkeys">
     <property name="idp.uri.subject.alt.name" value="https://${idp.host.name}/org/shibboleth/idp"/>
   </target>
 
-  <target name="getkeystorepassword" unless="uri.keystore.password">
-    <input message="Key Store Password" addproperty="uri.keystore.password"/>
-  </target>
-
-  <!--
+  <target name="getkeystorepassword"  if="idp.ask.keystore.password" depends="checkkeys">
+    <input message="Key Store Password" addproperty="idp.keystore.password"/>
+  </target>
+
+  <target name="getsealerpassword" if="idp.ask.sealer.password" depends="checkkeys">
+    <input message="Sealer Password" addproperty="idp.sealer.password"/>
+  </target>
+
+  <target name="getsealeralias" if="idp.ask.sealer.alias" depends="checkkeys">
+    <input message="Sealer Alias" addproperty="idp.sealer.alias"/>
+  </target>
+
+   <!--
 
     KEY MANAGEMENT
 
@@ -50,6 +58,79 @@
     <available property="idp.encryption.present" file="${idp.target.dir}/creds/idp-encryption.crt"/>
     <available property="idp.keystore.present" file="${idp.target.dir}/creds/idp-tls.p12"/>
     <available property="idp.sealer.present" file="${idp.target.dir}/creds/sealer.kver"/>
+    <condition property="idp.will.call.certgen">
+      <!-- we will call the cert gen if
+                EITHER we don't have a signing key
+                OR we don't have a encryption key
+                OR we don't have a tls -->
+      <or>
+        <not>
+          <istrue value="${idp.signing.present}"/>
+        </not>

[... 88 lines stripped ...]