[java-identity-provider COMMIT] in /trunk: idp-conf/src/test/resources/creds/idp-ssl.p12 idp-distribution/src/main/re...

[noreply at shibboleth.net]

Author: rdw
Date: Tue Sep 23 04:51:02 2014
New Revision: 6557

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6557&view=rev
Log:
Fix integration tests revert war path (inadvertantly changed) and add the now separate SSL keystore to the test files

Added:
    trunk/idp-conf/src/test/resources/creds/idp-ssl.p12   (with props)
Modified:
    trunk/idp-distribution/src/main/resources/jetty-base/start.d/idp.ini

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=6557&r1=6556&r2=6557&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 Tue Sep 23 04:51:02 2014
@@ -29,8 +29,8 @@
 # The IdP webapp context path
 jetty.context.path=/idp
 
-# Path to IdP WAR, relative to ${jetty.base} directory
-jetty.war.path=../idp.war
+# Path to IdP WAR (dir or file), relative to ${jetty.base} directory
+jetty.war.path=../war
 
 # Path to JAAS config
 jetty.jaas.path=conf/authn/jaas.config