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

[noreply at shibboleth.net]

Author: scantor
Date: Fri Mar 11 21:50:28 2016
New Revision: 8149

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

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

Rework legacy boolean property into Predicate and deprecate old version.
Extend redesign to ProfileConfiguration abstract base.
Wiring changes to relying-party-system beans.

Modified:
    trunk/idp-conf/pom.xml
    trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/AbstractProfileConfiguration.java
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/logic/DetailedErrorsPredicate.java
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfiguration.java
    trunk/idp-profile-api/src/test/java/net/shibboleth/idp/profile/config/AbstractProfileConfigurationTest.java
    trunk/idp-profile-api/src/test/java/net/shibboleth/idp/relyingparty/RelyingPartyConfigurationTest.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyGroupTest.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyTest.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/logic/DetailedErrorsProfileConfigPredicate.java

Modified: trunk/idp-conf/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/pom.xml?rev=8149&r1=8148&r2=8149&view=diff
==============================================================================
--- trunk/idp-conf/pom.xml	(original)
+++ trunk/idp-conf/pom.xml	Fri Mar 11 21:50:28 2016
@@ -49,6 +49,12 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>idp-authn-impl</artifactId>
+            <version>${project.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>idp-cas-impl</artifactId>
             <version>${project.version}</version>
             <optional>true</optional>
         </dependency>

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=8149&r1=8148&r2=8149&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	Fri Mar 11 21:50:28 2016
@@ -26,22 +26,28 @@
 
     <!-- Parent bean for generic RelyingParty overrides that establishes defaults. -->
     <bean id="RelyingParty" abstract="true" class="net.shibboleth.idp.relyingparty.RelyingPartyConfiguration"
-        p:responderId-ref="entityID" p:detailedErrors="%{idp.errors.detailed:false}" />
+        p:servletRequest-ref="shibboleth.HttpServletRequest"
+        p:responderId="#{getObject('entityID')}"
+        p:detailedErrorsPredicate="%{idp.errors.detailed:false}" />
 
     <!-- Parent bean for RelyingParty overrides based on activation by name(s). -->
     <bean id="RelyingPartyByName" abstract="true"
         class="net.shibboleth.idp.saml.relyingparty.impl.RelyingPartyConfigurationSupport" factory-method="byName"
-        p:responderId-ref="entityID" p:detailedErrors="%{idp.errors.detailed:false}" />
+        p:servletRequest-ref="shibboleth.HttpServletRequest"
+        p:responderId="#{getObject('entityID')}" p:detailedErrorsPredicate="%{idp.errors.detailed:false}" />
 
     <!-- Parent bean for RelyingParty overrides based on activation by group. -->
     <bean id="RelyingPartyByGroup" abstract="true"
         class="net.shibboleth.idp.saml.relyingparty.impl.RelyingPartyConfigurationSupport" factory-method="byGroup"
-        p:responderId-ref="entityID" p:detailedErrors="%{idp.errors.detailed:false}" />
+        p:servletRequest-ref="shibboleth.HttpServletRequest"
+        p:responderId="#{getObject('entityID')}" p:detailedErrorsPredicate="%{idp.errors.detailed:false}" />
 
     <!-- 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:servletRequest-ref="shibboleth.HttpServletRequest"
+        p:responderId="#{getObject('entityID')}" p:detailedErrorsPredicate="%{idp.errors.detailed:false}"
+        c:trim="false" c:matchAll="false" />
 
     <bean id="TagCandidate" abstract="true"
         class="org.opensaml.saml.common.profile.logic.EntityAttributesPredicate.Candidate" />
@@ -50,59 +56,71 @@
     
     <bean id="Shibboleth.SSO"

[... 622 lines stripped ...]