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

[noreply at shibboleth.net]

Author: putmanb
Date: Thu Jun 16 18:38:56 2016
New Revision: 8270

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8270&view=rev
Log:
IDP-1001: Update bean wiring to use new PredicateRoleDescriptorResolver

Modified:
    trunk/idp-conf/src/main/resources/system/conf/services-system.xml
    trunk/idp-conf/src/main/resources/system/flows/admin/resolvertest-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-beans.xml
    trunk/idp-conf/src/test/resources/mapping/webflows/beans.xml
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/security/impl/MetadataPKIXValidationInformationResolverTest.java

Modified: trunk/idp-conf/src/main/resources/system/conf/services-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/services-system.xml?rev=8270&r1=8269&r2=8270&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/services-system.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/conf/services-system.xml	Thu Jun 16 18:38:56 2016
@@ -124,7 +124,7 @@
         c:resolverService-ref="shibboleth.MetadataResolverService" />
         
     <bean id="shibboleth.RoleDescriptorResolver"
-        class="org.opensaml.saml.metadata.resolver.impl.BasicRoleDescriptorResolver"
+        class="org.opensaml.saml.metadata.resolver.impl.PredicateRoleDescriptorResolver"
         c:mdResolver-ref="shibboleth.MetadataResolver" />   
         
     <bean id="shibboleth.AccessControlService"

Modified: trunk/idp-conf/src/main/resources/system/flows/admin/resolvertest-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/admin/resolvertest-beans.xml?rev=8270&r1=8269&r2=8270&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/admin/resolvertest-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/admin/resolvertest-beans.xml	Thu Jun 16 18:38:56 2016
@@ -74,7 +74,7 @@
         <constructor-arg name="messageHandler">
             <bean class="org.opensaml.saml.common.binding.impl.SAMLMetadataLookupHandler" scope="prototype">
                 <property name="roleDescriptorResolver">
-                    <bean class="org.opensaml.saml.metadata.resolver.impl.BasicRoleDescriptorResolver"
+                    <bean class="org.opensaml.saml.metadata.resolver.impl.PredicateRoleDescriptorResolver"
                         c:mdResolver-ref="shibboleth.MetadataResolver" />
                 </property>
             </bean>

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml?rev=8270&r1=8269&r2=8270&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml	Thu Jun 16 18:38:56 2016
@@ -63,7 +63,7 @@
         <constructor-arg name="messageHandler">
             <bean class="org.opensaml.saml.common.binding.impl.SAMLMetadataLookupHandler" scope="prototype">
                 <property name="roleDescriptorResolver">
-                    <bean class="org.opensaml.saml.metadata.resolver.impl.BasicRoleDescriptorResolver"
+                    <bean class="org.opensaml.saml.metadata.resolver.impl.PredicateRoleDescriptorResolver"
                         c:mdResolver-ref="shibboleth.MetadataResolver" />
                 </property>
             </bean>

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-beans.xml?rev=8270&r1=8269&r2=8270&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-beans.xml	Thu Jun 16 18:38:56 2016
@@ -150,7 +150,7 @@
             <bean class="org.opensaml.saml.common.binding.impl.SAMLMetadataLookupHandler" scope="prototype"
                 p:entityContextClass="org.opensaml.saml.common.messaging.context.SAMLPresenterEntityContext">
                 <property name="roleDescriptorResolver">
-                    <bean class="org.opensaml.saml.metadata.resolver.impl.BasicRoleDescriptorResolver"
+                    <bean class="org.opensaml.saml.metadata.resolver.impl.PredicateRoleDescriptorResolver"
                         c:mdResolver-ref="shibboleth.MetadataResolver" />
                 </property>
             </bean>


[... 63 lines stripped ...]