[java-identity-provider COMMIT] in /trunk/idp-distribution/src/main/resources/bin: creds.bat creds.sh keygen.bat keyg...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Oct  9 16:50:07 2014
New Revision: 6664

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6664&view=rev
Log:
IDP-481 - redo key gen scripts

Added:
    trunk/idp-distribution/src/main/resources/bin/keygen.bat
      - copied, changed from r6658, trunk/idp-distribution/src/main/resources/bin/creds.bat
    trunk/idp-distribution/src/main/resources/bin/keygen.sh
      - copied, changed from r6658, trunk/idp-distribution/src/main/resources/bin/creds.sh
    trunk/idp-distribution/src/main/resources/bin/seckeygen.bat
    trunk/idp-distribution/src/main/resources/bin/seckeygen.sh
Modified:
    trunk/idp-distribution/src/main/resources/bin/creds.bat
    trunk/idp-distribution/src/main/resources/bin/creds.sh

Copied: trunk/idp-distribution/src/main/resources/bin/keygen.bat (from r6658, 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/keygen.bat?p2=trunk/idp-distribution/src/main/resources/bin/keygen.bat&p1=trunk/idp-distribution/src/main/resources/bin/creds.bat&r1=6658&r2=6664&rev=6664&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/creds.bat (original)
+++ trunk/idp-distribution/src/main/resources/bin/keygen.bat Thu Oct  9 16:50:07 2014
@@ -1,20 +1,4 @@
 @echo off
+setlocal
 
-rem This is a rudimentary script to generate credentials for the IdP.
-rem Run from within the idp.home directory as bin\creds.bat.
-
-set HOSTNAME=idp.example.org
-
-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%
-
-set CLASS=net.shibboleth.utilities.java.support.security.BasicKeystoreKeyStrategyTool
-
-java -cp "bin/lib\*;war\WEB-INF\lib\*" %CLASS% --storefile creds/sealer.jks --versionfile creds/sealer.kver --alias secret --storepass password
+%~dp0\runclass.bat net.shibboleth.utilities.java.support.security.SelfSignedCertificateGenerator %*

Copied: trunk/idp-distribution/src/main/resources/bin/keygen.sh (from r6658, 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/keygen.sh?p2=trunk/idp-distribution/src/main/resources/bin/keygen.sh&p1=trunk/idp-distribution/src/main/resources/bin/creds.sh&r1=6658&r2=6664&rev=6664&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/creds.sh (original)
+++ trunk/idp-distribution/src/main/resources/bin/keygen.sh Thu Oct  9 16:50:07 2014
@@ -1,20 +1,8 @@
-#! /bin/sh
+#! /bin/bash
 
-# This is a rudimentary script to generate credentials for the IdP.
-# Run from within the idp.home directory as bin/creds.sh.
+declare LOCATION
 
-HOSTNAME=idp.example.org
+LOCATION=$0
+LOCATION=${LOCATION%/*}
 
-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
-
-CLASS=net.shibboleth.utilities.java.support.security.BasicKeystoreKeyStrategyTool
-
-java -cp "bin/lib/*:war/WEB-INF/lib/*" $CLASS --storefile creds/sealer.jks --versionfile creds/sealer.kver --alias secret --storepass password
+$LOCATION/runclass.sh net.shibboleth.utilities.java.support.security.SelfSignedCertificateGenerator "$@"