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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Sep 16 20:52:38 2014
New Revision: 6534

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6534&view=rev
Log:
Add a placeholder file for user-defined beans.

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

Modified: trunk/idp-conf/src/main/resources/system/conf/global-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/global-system.xml?rev=6534&r1=6533&r2=6534&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/global-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/global-system.xml Tue Sep 16 20:52:38 2014
@@ -43,6 +43,7 @@
     <import resource="subject-c14n-system.xml" />
     <import resource="post-authn-system.xml" />
     <import resource="utilities.xml" />
+    <import resource="../../conf/global.xml" />
     
     <bean id="shibboleth.TaskTimer" class="java.util.Timer" destroy-method="cancel"/> <!--  only needed if you do reloading -->