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

[noreply at shibboleth.net]

Author: rdw
Date: Sat Oct 10 09:48:18 2015
New Revision: 7805

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7805&view=rev
Log:
IDP-715 Add Classpath*: location to contextConfigLocation

https://issues.shibboleth.net/jira/browse/IDP-715

We add classpath*:/META-INF/net.shibboleth.idp/config.xml to contextConfigLocation in web.xml.  This allows any plugin to automate a large proportion of its configuration.

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=7805&r1=7804&r2=7805&view=diff
==============================================================================
--- trunk/idp-war/src/main/webapp/WEB-INF/web.xml	(original)
+++ trunk/idp-war/src/main/webapp/WEB-INF/web.xml	Sat Oct 10 09:48:18 2015
@@ -8,7 +8,7 @@
         same named beans in previous files. -->
     <context-param>
         <param-name>contextConfigLocation</param-name>
-        <param-value>${idp.home}/system/conf/global-system.xml</param-value>
+        <param-value>${idp.home}/system/conf/global-system.xml,classpath*:/META-INF/net.shibboleth.idp/config.xml</param-value>
     </context-param>
     
     <context-param>