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

[noreply at shibboleth.net]

Author: rdw
Date: Tue May 12 10:45:51 2015
New Revision: 7515

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7515&view=rev
Log:
IDP-722 Allow files to not be delimited by spaces.

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=7515&r1=7514&r2=7515&view=diff
==============================================================================
--- trunk/idp-war/src/main/webapp/WEB-INF/web.xml	(original)
+++ trunk/idp-war/src/main/webapp/WEB-INF/web.xml	Tue May 12 10:45:51 2015
@@ -13,7 +13,7 @@
     
     <context-param>
         <param-name>contextClass</param-name>
-        <param-value>net.shibboleth.ext.spring.context.DeferPlaceholderFileSystemXmlWebApplicationContext</param-value>
+        <param-value>net.shibboleth.ext.spring.context.DelimiterAwareDeferPlaceholderFileSystemXmlWebApplicationContext</param-value>
     </context-param>
     
     <context-param>
@@ -131,11 +131,11 @@
         <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
         <init-param>
             <param-name>contextConfigLocation</param-name>
-            <param-value>${idp.home}/system/conf/mvc-beans.xml ${idp.home}/system/conf/webflow-config.xml</param-value>
+            <param-value>${idp.home}/system/conf/mvc-beans.xml, ${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>
+            <param-value>net.shibboleth.ext.spring.context.DelimiterAwareDeferPlaceholderFileSystemXmlWebApplicationContext</param-value>
         </init-param>
         <load-on-startup>1</load-on-startup>
     </servlet>