[java-identity-provider] branch master updated: Get rid of remaining non-default wiring.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=32dcb5d0fb327ae5d9ec18bbc5803a513321915c

The following commit(s) were added to refs/heads/master by this push:
       new  32dcb5d   Get rid of remaining non-default wiring.
32dcb5d is described below

commit 32dcb5d0fb327ae5d9ec18bbc5803a513321915c
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Oct 1 10:38:15 2018 -0400

    Get rid of remaining non-default wiring.
---
 .../resources/system/conf/relying-party-mddriven.xml   | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/idp-conf/src/main/resources/system/conf/relying-party-mddriven.xml b/idp-conf/src/main/resources/system/conf/relying-party-mddriven.xml
index c187af1..b669763 100644
--- a/idp-conf/src/main/resources/system/conf/relying-party-mddriven.xml
+++ b/idp-conf/src/main/resources/system/conf/relying-party-mddriven.xml
@@ -59,8 +59,6 @@
         </property>
     </bean>
 
-    <!-- ProfileRequestContext-based access to metadata properties of various types. -->
-
     <bean id="shibboleth.AbstractMDDrivenProperty" abstract="true"
         p:profileAliases="#{getObject('shibboleth.MDProfileAliases') ?: getObject('shibboleth.DefaultMDProfileAliases')}" />
     
@@ -85,14 +83,6 @@
     <bean id="shibboleth.MDDrivenBeanProperty" abstract="true" parent="shibboleth.AbstractMDDrivenProperty"
         class="net.shibboleth.idp.saml.profile.config.BeanConfigurationLookupStrategy" />
 
-    <!-- MessageContext-based access to metadata properties of various types. -->
-
-    <bean id="shibboleth.AbstractMDDrivenMessagingProperty" parent="shibboleth.AbstractMDDrivenProperty" abstract="true"
-        p:profileIdLookupStrategy-ref="SOAPClient.SOAPClientSecurityProfileIdLookup" />
-
-    <bean id="shibboleth.MDDrivenBoolMessagingProperty" abstract="true" parent="shibboleth.AbstractMDDrivenMessagingProperty"
-        class="net.shibboleth.idp.saml.profile.config.BooleanConfigurationLookupStrategy" />
-
     <!-- Wiring lookup strategies into the actual profile configurations of various types. -->
 
     <bean id="AbstractMDDrivenProfile" parent="AbstractProfileConfig" abstract="true">
@@ -288,7 +278,7 @@
         <property name="signArtifactRequests">
             <bean class="net.shibboleth.utilities.java.support.logic.PredicateSupport" factory-method="fromFunction">
                 <constructor-arg>
-                    <bean parent="shibboleth.MDDrivenBoolMessagingProperty" p:propertyName="signArtifactRequests" />
+                    <bean parent="shibboleth.MDDrivenBoolProperty" p:propertyName="signArtifactRequests" />
                 </constructor-arg>
                 <constructor-arg>
                     <bean class="org.opensaml.messaging.logic.NoIntegrityMessageChannelPredicate" />
@@ -298,7 +288,7 @@
         <property name="clientTLSArtifactRequests">
             <bean class="net.shibboleth.utilities.java.support.logic.PredicateSupport" factory-method="fromFunction">
                 <constructor-arg>
-                    <bean parent="shibboleth.MDDrivenBoolMessagingProperty" p:propertyName="clientTLSArtifactRequests" />
+                    <bean parent="shibboleth.MDDrivenBoolProperty" p:propertyName="clientTLSArtifactRequests" />
                 </constructor-arg>
                 <constructor-arg>
                     <bean parent="shibboleth.Conditions.NOT">
@@ -398,7 +388,7 @@
         <property name="signArtifactRequests">
             <bean class="net.shibboleth.utilities.java.support.logic.PredicateSupport" factory-method="fromFunction">
                 <constructor-arg>
-                    <bean parent="shibboleth.MDDrivenBoolMessagingProperty" p:propertyName="signArtifactRequests" />
+                    <bean parent="shibboleth.MDDrivenBoolProperty" p:propertyName="signArtifactRequests" />
                 </constructor-arg>
                 <constructor-arg>
                     <bean class="org.opensaml.messaging.logic.NoIntegrityMessageChannelPredicate" />
@@ -408,7 +398,7 @@
         <property name="clientTLSArtifactRequests">
             <bean class="net.shibboleth.utilities.java.support.logic.PredicateSupport" factory-method="fromFunction">
                 <constructor-arg>
-                    <bean parent="shibboleth.MDDrivenBoolMessagingProperty" p:propertyName="clientTLSArtifactRequests" />
+                    <bean parent="shibboleth.MDDrivenBoolProperty" p:propertyName="clientTLSArtifactRequests" />
                 </constructor-arg>
                 <constructor-arg>
                     <bean parent="shibboleth.Conditions.NOT">

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.