[java-idp-testbed COMMIT] /trunk/src/main/resources/system/conf/testbed-beans.xml

[noreply at shibboleth.net]

Author: putmanb
Date: Fri May 16 22:44:12 2014
New Revision: 229

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=229&view=rev
Log:
Fix Spring config reference to removed global SecurityConfiguration.

Modified:
    trunk/src/main/resources/system/conf/testbed-beans.xml

Modified: trunk/src/main/resources/system/conf/testbed-beans.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/resources/system/conf/testbed-beans.xml?rev=229&r1=228&r2=229&view=diff
==============================================================================
--- trunk/src/main/resources/system/conf/testbed-beans.xml (original)
+++ trunk/src/main/resources/system/conf/testbed-beans.xml Fri May 16 22:44:12 2014
@@ -15,9 +15,9 @@
     
     <bean id="testbed.IdGenerator" class="net.shibboleth.utilities.java.support.security.Type4UuidIdentifierGenerationStrategy" />
     
-    <bean id="testbed.GlobalSecurityConfiguration" factory-method="getGlobalXMLSecurityConfiguration" class="org.opensaml.xmlsec.SecurityConfigurationSupport" />
+    <bean id="testbed.KeyInfoCredentialResolver" class="org.opensaml.xmlsec.config.DefaultSecurityConfigurationBootstrap"
+        factory-method="buildBasicInlineKeyInfoCredentialResolver" />
     
-    <bean id="testbed.KeyInfoCredentialResolver" factory-method="getDefaultKeyInfoCredentialResolver" factory-bean="testbed.GlobalSecurityConfiguration" />
     
     
     <!-- Specific testbed-related beans -->