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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Sep 22 11:51:16 2015
New Revision: 7768

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7768&view=rev
Log:
Move parent bean over to utilities.

Modified:
    trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml
    trunk/idp-conf/src/main/resources/system/conf/utilities.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=7768&r1=7767&r2=7768&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	Tue Sep 22 11:51:16 2015
@@ -45,21 +45,6 @@
     <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. -->
     

Modified: trunk/idp-conf/src/main/resources/system/conf/utilities.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/utilities.xml?rev=7768&r1=7767&r2=7768&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/utilities.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/conf/utilities.xml	Tue Sep 22 11:51:16 2015
@@ -33,6 +33,21 @@
     <bean id="shibboleth.Conditions.Expression"
         class="net.shibboleth.idp.profile.logic.SpringExpressionPredicate" abstract="true" />
 
+    <!-- Parent bean for building custom predicates that act on a RP's EntityDescriptor. -->
+    <bean id="shibboleth.Conditions.EntityDescriptor" 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>
+
     <bean id="shibboleth.MessageContextLookup.Inbound"
         class="org.opensaml.profile.context.navigate.InboundMessageContextLookup" />
     <bean id="shibboleth.MessageContextLookup.Outbound"