[java-identity-provider COMMIT] in /trunk: idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java...

[noreply at shibboleth.net]

Author: tzeller
Date: Sun Jun 22 02:39:51 2014
New Revision: 6145

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6145&view=rev
Log:
Configure an application context initializer to find and load idp.properties and ensure that idp.home is set.

Modified:
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java
    trunk/idp-war/src/main/webapp/WEB-INF/web.xml

Modified: trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java?rev=6145&r1=6144&r2=6145&view=diff
==============================================================================
--- trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java (original)
+++ trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java Sun Jun 22 02:39:51 2014
@@ -30,6 +30,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import net.shibboleth.ext.spring.context.IdPPropertiesApplicationContextInitializer;
 import net.shibboleth.ext.spring.factory.X509CertificateFactoryBean;
 import net.shibboleth.idp.authn.SubjectCanonicalizationFlowDescriptor;
 import net.shibboleth.idp.profile.logic.RelyingPartyIdPredicate;
@@ -94,7 +95,8 @@
  * Abstract flow test.
  */
 @ContextConfiguration(locations = {"/system/conf/global-system.xml", "/conf/global.xml", "/system/conf/mvc-beans.xml",
-        "/system/conf/webflow-config.xml", "/test/test-beans.xml"}, loader = PreferFileSystemContextLoader.class)
+        "/system/conf/webflow-config.xml", "/test/test-beans.xml"},
+        initializers = IdPPropertiesApplicationContextInitializer.class, loader = PreferFileSystemContextLoader.class)
 @WebAppConfiguration
 public abstract class AbstractFlowTest extends AbstractTestNGSpringContextTests {
 

Modified: trunk/idp-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-war/src/main/webapp/WEB-INF/web.xml?rev=6145&r1=6144&r2=6145&view=diff
==============================================================================
--- trunk/idp-war/src/main/webapp/WEB-INF/web.xml (original)
+++ trunk/idp-war/src/main/webapp/WEB-INF/web.xml Sun Jun 22 02:39:51 2014
@@ -16,6 +16,11 @@
     <context-param>
         <param-name>contextClass</param-name>
         <param-value>net.shibboleth.ext.spring.context.DeferPlaceholderFileSystemXmlWebApplicationContext</param-value>
+    </context-param>
+    
+    <context-param>
+        <param-name>contextInitializerClasses</param-name>
+        <param-value>net.shibboleth.ext.spring.context.IdPPropertiesApplicationContextInitializer</param-value>
     </context-param>
 
     <!-- Spring listener used to load up the configuration -->