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

[noreply at shibboleth.net]

Author: putmanb
Date: Tue May 13 20:44:57 2014
New Revision: 5922

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5922&view=rev
Log:
Update Spring bean for MetadataCredentialResolver to reflect refactoring.

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=5922&r1=5921&r2=5922&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 May 13 20:44:57 2014
@@ -155,16 +155,19 @@
 
     <!-- TODO: all this is probably wrong, but need it to get something working -->
     
-    <bean id="shibboleth.MetadataCredentialResolver" class="org.opensaml.saml.security.impl.MetadataCredentialResolver">
-        <constructor-arg>
-            <bean class="org.opensaml.saml.metadata.resolver.impl.BasicRoleDescriptorResolver"
-                c:mdResolver-ref="shibboleth.MetadataResolver" />
-        </constructor-arg>
+    <bean id="shibboleth.RoleDescriptorResolver" class="org.opensaml.saml.metadata.resolver.impl.BasicRoleDescriptorResolver"
+        c:mdResolver-ref="shibboleth.MetadataResolver" />
+    
+    <bean id="shibboleth.MetadataCredentialResolver" class="org.opensaml.saml.security.impl.MetadataCredentialResolver"
+         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" />