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

[noreply at shibboleth.net]

Author: rdw
Date: Tue Apr 22 06:08:06 2014
New Revision: 5759

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5759&view=rev
Log:
IDP-391 Migrate the shibboleth.Metadatresolver into the profile actions and their setup

Modified:
    trunk/idp-conf/src/main/resources/conf/global-user.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml

Modified: trunk/idp-conf/src/main/resources/conf/global-user.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/global-user.xml?rev=5759&r1=5758&r2=5759&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/global-user.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/global-user.xml Tue Apr 22 06:08:06 2014
@@ -91,8 +91,4 @@
         <value>file://${idp.home}/conf/property-placeholder.xml</value>
     </util:list>
 
-    <!-- TODO: replace ExampleMetadataResolver in configs with  shibboleth.MetadataResolver -->
-    <alias name="shibboleth.MetadataResolver" alias="ExampleMetadataResolver"/>
-    
-
 </beans>

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=5759&r1=5758&r2=5759&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 Tue Apr 22 06:08:06 2014
@@ -49,7 +49,7 @@
             <bean class="org.opensaml.saml.common.binding.impl.SAMLMetadataLookupHandler" scope="prototype">
                 <property name="roleDescriptorResolver">
                     <bean class="org.opensaml.saml.metadata.resolver.impl.BasicRoleDescriptorResolver"
-                        c:mdResolver-ref="ExampleMetadataResolver" />
+                        c:mdResolver-ref="shibboleth.MetadataResolver" />
                 </property>
             </bean>
         </constructor-arg>
@@ -97,7 +97,7 @@
             class="net.shibboleth.idp.saml.profile.impl.ExtractSubjectFromRequest" scope="prototype">
         <property name="nameIDPolicyPredicate">
             <bean class="org.opensaml.saml.common.profile.logic.AffiliationNameIDPolicyPredicate"
-                    p:metadataResolver-ref="ExampleMetadataResolver"
+                    p:metadataResolver-ref="shibboleth.MetadataResolver"
                     p:responderIdLookupStrategy-ref="shibboleth.ResponderIdLookup.Simple"
                     p:requesterIdLookupStrategy-ref="shibboleth.RelyingPartyIdLookup.Simple">
                 <property name="objectLookupStrategy">

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml?rev=5759&r1=5758&r2=5759&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml Tue Apr 22 06:08:06 2014
@@ -75,7 +75,7 @@
         </property>
         <property name="nameIDPolicyPredicate">
             <bean class="org.opensaml.saml.common.profile.logic.AffiliationNameIDPolicyPredicate"
-                    p:metadataResolver-ref="ExampleMetadataResolver"
+                    p:metadataResolver-ref="shibboleth.MetadataResolver"
                     p:responderIdLookupStrategy-ref="shibboleth.ResponderIdLookup.Simple"
                     p:requesterIdLookupStrategy-ref="shibboleth.RelyingPartyIdLookup.Simple">
                 <property name="objectLookupStrategy">