[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: Fri Jul 11 09:52:24 2014
New Revision: 6279

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6279&view=rev
Log:
IDP-410 Add a very basic script to generate credentials and add the dependencies to war/WEB-INF/lib to run it.

Added:
    trunk/idp-distribution/src/main/resources/bin/creds.sh   (with props)
    trunk/idp-distribution/src/main/resources/creds/
Modified:
    trunk/idp-distribution/pom.xml
    trunk/idp-distribution/src/main/resources/jetty-base/start.d/idp.ini

Modified: trunk/idp-distribution/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/pom.xml?rev=6279&r1=6278&r2=6279&view=diff
==============================================================================
--- trunk/idp-distribution/pom.xml (original)
+++ trunk/idp-distribution/pom.xml Fri Jul 11 09:52:24 2014
@@ -26,6 +26,21 @@
         <!-- Provided Dependencies -->
 
         <!-- Runtime Dependencies -->
+        <!-- Required if using classes with command line support. -->
+        <dependency>
+            <groupId>com.beust</groupId>
+            <artifactId>jcommander</artifactId>
+            <optional>true</optional>
+            <scope>runtime</scope>
+        </dependency>
+        <!-- Required if you're using classes from the security package. -->
+        <dependency>
+            <!-- Required if you're using classes from the security package. -->
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcpkix-jdk15on</artifactId>
+            <optional>true</optional>
+            <scope>runtime</scope>
+        </dependency>
 
         <!-- Test Dependencies -->
 
@@ -118,6 +133,27 @@
                             </artifactItems>
                         </configuration>
                     </execution>
+                    <!-- Copy runtime dependencies to war/WEB-INF/lib directory. -->
+                    <execution>
+                        <id>copy-runtime-dependencies</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>com.beust</groupId>
+                                    <artifactId>jcommander</artifactId>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.bouncycastle</groupId>
+                                    <artifactId>bcpkix-jdk15on</artifactId>
+                                </artifactItem>
+                            </artifactItems>
+                            <outputDirectory>${assembly-directory}/war/WEB-INF/lib/</outputDirectory>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <!-- Replace antrun plugin with something else ? -->

Modified: trunk/idp-distribution/src/main/resources/jetty-base/start.d/idp.ini
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/jetty-base/start.d/idp.ini?rev=6279&r1=6278&r2=6279&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/jetty-base/start.d/idp.ini (original)
+++ trunk/idp-distribution/src/main/resources/jetty-base/start.d/idp.ini Fri Jul 11 09:52:24 2014
@@ -14,7 +14,7 @@
 jetty.backchannel.port=9443
 
 # Path to keystore, relative to ${jetty.base} directory
-jetty.keystore.path=../creds/localhost.p12
+jetty.keystore.path=../creds/idp-tls.p12
 
 # Keystore password
 jetty.keystore.password=changeit