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

[noreply at shibboleth.net]

Author: scantor
Date: Wed Jun 10 10:21:00 2015
New Revision: 7555

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7555&view=rev
Log:
IDP-739 - Add a template bean for building predicates against metadata

Modified:
    trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml

Modified: trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml?rev=7555&r1=7554&r2=7555&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml	Wed Jun 10 10:21:00 2015
@@ -39,12 +39,27 @@
     <!-- Parent bean for RelyingParty overrides based on activation by tag. -->
     <bean id="RelyingPartyByTag" abstract="true"
         class="net.shibboleth.idp.saml.relyingparty.impl.RelyingPartyConfigurationSupport" factory-method="byTag"
-        p:responderId-ref="entityID" p:detailedErrors="%{idp.errors.detailed:false}" c:trim="false" c:matchAll="false" />
-        
+        p:responderId-ref="entityID" p:detailedErrors="%{idp.errors.detailed:false}" c:trim="false" c:matchAll="false" />    
+
     <bean id="TagCandidate" abstract="true"
         class="org.opensaml.saml.common.profile.logic.EntityAttributesPredicate.Candidate"
         c:format="#{null}" />
 
+    <!-- Parent bean for building custom predicates that act on the RP's EntityDescriptor. -->
+    <bean id="EntityDescriptorPredicate" abstract="true"
+            class="net.shibboleth.utilities.java.support.logic.StrategyIndirectedPredicate">
+        <constructor-arg name="objectStrategy">
+            <bean class="com.google.common.base.Functions" factory-method="compose">
+                <constructor-arg>
+                    <bean class="org.opensaml.saml.common.messaging.context.navigate.EntityDescriptorLookupFunction" />
+                </constructor-arg>
+                <constructor-arg>
+                    <bean class="net.shibboleth.idp.saml.profile.context.navigate.SAMLMetadataContextLookupFunction" />
+                </constructor-arg>
+            </bean>
+        </constructor-arg>
+    </bean>
+        
     <!-- Default Profile Configurations, also usable as parent beans in overrides. -->
     
     <bean id="Shibboleth.SSO"