[java-identity-provider COMMIT] in /trunk/idp-distribution: pom.xml src/main/resources/bin/creds.sh src/main/resource...

[noreply at shibboleth.net]

Author: tzeller
Date: Tue Jul 22 23:52:57 2014
New Revision: 6334

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6334&view=rev
Log:
IDP-436 Move runtime dependencies for generating credentials to bin/lib rather than war/WEB-INF/lib.

Added:
    trunk/idp-distribution/src/main/resources/bin/lib/
Modified:
    trunk/idp-distribution/pom.xml
    trunk/idp-distribution/src/main/resources/bin/creds.sh

Modified: trunk/idp-distribution/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/pom.xml?rev=6334&r1=6333&r2=6334&view=diff
==============================================================================
--- trunk/idp-distribution/pom.xml (original)
+++ trunk/idp-distribution/pom.xml Tue Jul 22 23:52:57 2014
@@ -133,7 +133,7 @@
                             </artifactItems>
                         </configuration>
                     </execution>
-                    <!-- Copy runtime dependencies to war/WEB-INF/lib directory. -->
+                    <!-- Copy runtime dependencies to bin/lib directory. -->
                     <execution>
                         <id>copy-runtime-dependencies</id>
                         <phase>prepare-package</phase>
@@ -151,7 +151,7 @@
                                     <artifactId>bcpkix-jdk15on</artifactId>
                                 </artifactItem>
                             </artifactItems>
-                            <outputDirectory>${assembly-directory}/war/WEB-INF/lib/</outputDirectory>
+                            <outputDirectory>${assembly-directory}/bin/lib/</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>

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=6334&r1=6333&r2=6334&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/creds.sh (original)
+++ trunk/idp-distribution/src/main/resources/bin/creds.sh Tue Jul 22 23:52:57 2014
@@ -10,11 +10,11 @@
 
 CLASS=net.shibboleth.utilities.java.support.security.SelfSignedCertificateGenerator
 
-java -cp "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-signing.key --certfile creds/idp-signing.crt --uriAltName $URI_ALT_NAME
 
-java -cp "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 --keyfile creds/idp-encryption.key --certfile creds/idp-encryption.crt --uriAltName $URI_ALT_NAME
 
-java -cp "war/WEB-INF/lib/*" $CLASS --hostname $HOSTNAME --storefile creds/idp-tls.p12 --storepass changeit --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
 
 # TODO generate creds/sealer.jks
 keytool -genseckey -alias idpSecretKey -keypass password -storepass password -storetype JCEKS -keyalg AES -keysize 256 -keystore creds/sealer.jks