[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/mvc-beans.xml system/conf/mvc-beans.xml

[noreply at shibboleth.net]

Author: scantor
Date: Wed Oct 21 10:58:45 2015
New Revision: 7844

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7844&view=rev
Log:
IDP-837 - Add import of user-defined beans into MVC config

Added:
    trunk/idp-conf/src/main/resources/conf/mvc-beans.xml   (with props)
Modified:
    trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml

Modified: trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml?rev=7844&r1=7843&r2=7844&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml	Wed Oct 21 10:58:45 2015
@@ -73,4 +73,7 @@
         <property name="contentType" value="text/html;charset=utf-8" />
     </bean>
 
+    <!-- Import any user defined beans or overrides for the MVC config. -->
+    <import resource="../../conf/mvc-beans.xml" />
+
 </beans>