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

[noreply at shibboleth.net]

Author: putmanb
Date: Fri May 16 20:40:30 2014
New Revision: 5939

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5939&view=rev
Log:
Remove old SecurityConfiguration interface and impl, and all references.
Port to new security config API where necessary.

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=5939&r1=5938&r2=5939&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 Fri May 16 20:40:30 2014
@@ -162,14 +162,9 @@
          p:roleDescriptorResolver-ref="shibboleth.RoleDescriptorResolver"            
          p:keyInfoCredentialResolver-ref="shibboleth.KeyInfoCredentialResolver">
     </bean>
-
-    <!--  TODO: this will need to go away, b/c the SecurityConfiguration is going away. -->
-    <bean id="shibboleth.GlobalSecurityConfiguration" class="org.opensaml.xmlsec.SecurityConfigurationSupport"
-        factory-method="getGlobalXMLSecurityConfiguration" />
     
-    <!--  TODO: this should probably transition to a helper class, or else just build it from a factory bean, etc. -->
-    <bean id="shibboleth.KeyInfoCredentialResolver" factory-bean="shibboleth.GlobalSecurityConfiguration"
-        factory-method="getDefaultKeyInfoCredentialResolver" />
+    <bean id="shibboleth.KeyInfoCredentialResolver" class="org.opensaml.xmlsec.config.DefaultSecurityConfigurationBootstrap"
+        factory-method="buildBasicInlineKeyInfoCredentialResolver" />
 
     <bean id="shibboleth.SignatureTrustEngine" class="org.opensaml.xmlsec.signature.support.impl.ExplicitKeySignatureTrustEngine">
         <constructor-arg ref="shibboleth.MetadataCredentialResolver" />