[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/conf/generate-credentials.xml idp-core/src/mai...

[noreply at shibboleth.net]

Author: tzeller
Date: Fri Jul 25 15:16:41 2014
New Revision: 6347

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6347&view=rev
Log:
Revert generating credentials using idp.properties via Spring.

Modified:
    trunk/idp-conf/src/main/resources/conf/generate-credentials.xml
    trunk/idp-core/src/main/java/net/shibboleth/idp/GenerateCredentials.java
    trunk/idp-distribution/src/main/resources/bin/creds.bat
    trunk/idp-distribution/src/main/resources/bin/creds.sh

Modified: trunk/idp-distribution/src/main/resources/bin/creds.bat
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/bin/creds.bat?rev=6347&r1=6346&r2=6347&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/creds.bat (original)
+++ trunk/idp-distribution/src/main/resources/bin/creds.bat Fri Jul 25 15:16:41 2014
@@ -2,9 +2,17 @@
 
 rem This is a rudimentary script to generate credentials for the IdP.
 rem Run from within the idp.home directory as bin\creds.bat.
-rem See conf\generate-credentials.xml to customize.
 
-java -cp "bin\lib\*;war\WEB-INF\lib\*" net.shibboleth.idp.GenerateCredentials
+set HOSTNAME=idp.example.org
 
-rem TODO generate creds/sealer.jks with parameters from conf/idp.properties
+set URI_ALT_NAME=https://idp.example.org/idp/shibboleth
+
+set CLASS=net.shibboleth.utilities.java.support.security.SelfSignedCertificateGenerator
+
+java -cp "bin\lib\*;war\WEB-INF\lib\*" %CLASS% --hostname %HOSTNAME% --keyfile creds/idp-signing.key --certfile creds/idp-signing.crt --uriAltName %URI_ALT_NAME%
+
+java -cp "bin\lib\*;war\WEB-INF\lib\*" %CLASS% --hostname %HOSTNAME% --keyfile creds/idp-encryption.key --certfile creds/idp-encryption.crt --uriAltName %URI_ALT_NAME%
+
+java -cp "bin\lib\*;war\WEB-INF\lib\*" %CLASS% --hostname %HOSTNAME% --storefile creds/idp-tls.p12 --storepass changeit --uriAltName %URI_ALT_NAME%
+
 keytool -genseckey -alias idpSecretKey -keypass password -storepass password -storetype JCEKS -keyalg AES -keysize 256 -keystore creds/sealer.jks

Modified: trunk/idp-distribution/src/main/resources/bin/creds.sh
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/bin/creds.sh?rev=6347&r1=6346&r2=6347&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/creds.sh (original)
+++ trunk/idp-distribution/src/main/resources/bin/creds.sh Fri Jul 25 15:16:41 2014
@@ -2,9 +2,17 @@
 
 # This is a rudimentary script to generate credentials for the IdP.
 # Run from within the idp.home directory as bin/creds.sh.
-# See conf/generate-credentials.xml to customize.
 
-java -cp "bin/lib/*:war/WEB-INF/lib/*" net.shibboleth.idp.GenerateCredentials
+HOSTNAME=idp.example.org
 
-# TODO generate creds/sealer.jks with parameters from conf/idp.properties
+URI_ALT_NAME=https://idp.example.org/idp/shibboleth
+
+CLASS=net.shibboleth.utilities.java.support.security.SelfSignedCertificateGenerator
+
+java -cp "bin/lib/*:war/WEB-INF/lib/*" $CLASS --hostname $HOSTNAME --keyfile creds/idp-signing.key --certfile creds/idp-signing.crt --uriAltName $URI_ALT_NAME
+
+java -cp "bin/lib/*:war/WEB-INF/lib/*" $CLASS --hostname $HOSTNAME --keyfile creds/idp-encryption.key --certfile creds/idp-encryption.crt --uriAltName $URI_ALT_NAME
+
+java -cp "bin/lib/*:war/WEB-INF/lib/*" $CLASS --hostname $HOSTNAME --storefile creds/idp-tls.p12 --storepass changeit --uriAltName $URI_ALT_NAME
+
 keytool -genseckey -alias idpSecretKey -keypass password -storepass password -storetype JCEKS -keyalg AES -keysize 256 -keystore creds/sealer.jks