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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Mar 15 16:14:36 2016
New Revision: 8157

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8157&view=rev
Log:
IDP-948 - Dynamic determination of profile and relying party configuration settings

https://issues.shibboleth.net/jira/browse/IDP-948

Apply to SAML profile configs and adjust some of the predicate-based lookup functions.

Modified:
    trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfiguration.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/AbstractSAMLProfileConfiguration.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/logic/IncludeAttributeStatementPredicate.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/logic/ResolveAttributesProfileConfigPredicate.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml1/profile/config/BrowserSSOProfileConfiguration.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/config/AbstractSAML2ProfileConfiguration.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/config/BrowserSSOProfileConfiguration.java
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/profile/config/AbstractSAMLProfileConfigurationTest.java
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml1/profile/config/BrowserSSOProfileConfigurationTest.java
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml2/profile/config/AbstractSAML2ProfileConfigurationTest.java
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml2/profile/config/BrowserSSOProfileConfigurationTest.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/PopulateBindingAndEndpointContexts.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/PopulateDelegationContext.java

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=8157&r1=8156&r2=8157&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 Mar 15 16:14:36 2016
@@ -75,38 +75,38 @@
         p:servletRequest-ref="shibboleth.HttpServletRequest"
         p:artifactConfiguration-ref="shibboleth.DefaultArtifactConfiguration"
         p:inboundInterceptorFlows="security-policy/saml2-sso"
-        p:encryptionOptional="%{idp.encryption.optional:false}" />
+        p:encryptionOptionalPredicate="%{idp.encryption.optional:false}" />
 
     <bean id="SAML2.ECP"
         class="net.shibboleth.idp.saml.saml2.profile.config.ECPProfileConfiguration"
         p:servletRequest-ref="shibboleth.HttpServletRequest"
         p:inboundInterceptorFlows="security-policy/saml2-ecp"
-        p:encryptionOptional="%{idp.encryption.optional:false}" />
+        p:encryptionOptionalPredicate="%{idp.encryption.optional:false}" />
 
     <bean id="SAML2.Logout"
         class="net.shibboleth.idp.saml.saml2.profile.config.SingleLogoutProfileConfiguration"
         p:servletRequest-ref="shibboleth.HttpServletRequest"
         p:artifactConfiguration-ref="shibboleth.DefaultArtifactConfiguration"
         p:inboundInterceptorFlows="security-policy/saml2-slo"
-        p:encryptionOptional="%{idp.encryption.optional:false}" />
+        p:encryptionOptionalPredicate="%{idp.encryption.optional:false}" />
 
     <bean id="SAML2.AttributeQuery"
         class="net.shibboleth.idp.saml.saml2.profile.config.AttributeQueryProfileConfiguration"
         p:servletRequest-ref="shibboleth.HttpServletRequest"
         p:inboundInterceptorFlows="security-policy/saml-soap"
-        p:encryptionOptional="%{idp.encryption.optional:false}" />
+        p:encryptionOptionalPredicate="%{idp.encryption.optional:false}" />
 
     <bean id="SAML2.ArtifactResolution"
         class="net.shibboleth.idp.saml.saml2.profile.config.ArtifactResolutionProfileConfiguration"
         p:servletRequest-ref="shibboleth.HttpServletRequest"
         p:inboundInterceptorFlows="security-policy/saml-soap"
-        p:encryptionOptional="%{idp.encryption.optional:false}" />
+        p:encryptionOptionalPredicate="%{idp.encryption.optional:false}" />
 
     <bean id="Liberty.SSOS"
         class="net.shibboleth.idp.saml.idwsf.profile.config.SSOSProfileConfiguration"
         p:servletRequest-ref="shibboleth.HttpServletRequest"
         p:inboundInterceptorFlows="security-policy/saml2-idwsf-ssos"
-        p:encryptionOptional="%{idp.encryption.optional:false}" />
+        p:encryptionOptionalPredicate="%{idp.encryption.optional:false}" />
 
     <bean id="CAS.LoginConfiguration"
         class="net.shibboleth.idp.cas.config.impl.LoginConfiguration"


[... 2076 lines stripped ...]