[java-identity-provider COMMIT] /trunk/idp-war/src/main/webapp/WEB-INF/web.xml

[noreply at shibboleth.net]

Author: tzeller
Date: Sun Jun 22 02:24:37 2014
New Revision: 6144

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6144&view=rev
Log:
Add custom root and idp application context which handles bare file system paths and defers placeholder resolution.

Modified:
    trunk/idp-war/src/main/webapp/WEB-INF/web.xml

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=6144&r1=6143&r2=6144&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:24:37 2014
@@ -11,6 +11,11 @@
     <context-param>
         <param-name>contextConfigLocation</param-name>
         <param-value>file:///${idp.home}/system/conf/global-system.xml file:///${idp.home}/conf/global.xml</param-value>
+    </context-param>
+    
+    <context-param>
+        <param-name>contextClass</param-name>
+        <param-value>net.shibboleth.ext.spring.context.DeferPlaceholderFileSystemXmlWebApplicationContext</param-value>
     </context-param>
 
     <!-- Spring listener used to load up the configuration -->
@@ -87,6 +92,10 @@
         <init-param>
             <param-name>contextConfigLocation</param-name>
             <param-value>file:///${idp.home}/system/conf/mvc-beans.xml file:///${idp.home}/system/conf/webflow-config.xml</param-value>
+        </init-param>
+        <init-param>
+            <param-name>contextClass</param-name>
+            <param-value>net.shibboleth.ext.spring.context.DeferPlaceholderFileSystemXmlWebApplicationContext</param-value>
         </init-param>
         <load-on-startup>1</load-on-startup>
     </servlet>