[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/flows/post-authn/consent/attribute-consent/att...

[noreply at shibboleth.net]

Author: tzeller
Date: Fri Oct 17 23:58:58 2014
New Revision: 6735

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6735&view=rev
Log:
Consent cleanup. One function to lookup interceptor flow descriptor types.

Added:
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/FlowDescriptorLookup.java
      - copied, changed from r6734, trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/FlowDescriptorLookupStrategy.java
    trunk/idp-consent/src/test/java/net/shibboleth/idp/consent/logic/
    trunk/idp-consent/src/test/java/net/shibboleth/idp/consent/logic/FlowDescriptorLookupTest.java   (with props)
Modified:
    trunk/idp-conf/src/main/resources/flows/post-authn/consent/attribute-consent/attribute-consent-beans.xml
    trunk/idp-conf/src/main/resources/flows/post-authn/consent/terms-of-use/terms-of-use-beans.xml
    trunk/idp-consent/pom.xml
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/AttributeConsentFlowDescriptorLookupStrategy.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/FlowDescriptorLookupStrategy.java

Modified: trunk/idp-conf/src/main/resources/flows/post-authn/consent/attribute-consent/attribute-consent-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/flows/post-authn/consent/attribute-consent/attribute-consent-beans.xml?rev=6735&r1=6734&r2=6735&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/flows/post-authn/consent/attribute-consent/attribute-consent-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/flows/post-authn/consent/attribute-consent/attribute-consent-beans.xml Fri Oct 17 23:58:58 2014
@@ -11,7 +11,8 @@
     <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
     <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
 
-    <bean id="AttributeConsentFlowDescriptorLookupStrategy" class="net.shibboleth.idp.consent.logic.AttributeConsentFlowDescriptorLookupStrategy" scope="prototype" />
+    <bean id="AttributeConsentFlowDescriptorLookupStrategy" class="net.shibboleth.idp.consent.logic.FlowDescriptorLookup" scope="prototype"
+        c:type="#{ T(net.shibboleth.idp.consent.flow.ar.AttributeConsentFlowDescriptor) }" />
 
     <bean id="GlobalAttributeConsentPredicate" class="net.shibboleth.idp.consent.logic.GlobalAttributeConsentPredicate" scope="prototype" />
 

Modified: trunk/idp-conf/src/main/resources/flows/post-authn/consent/terms-of-use/terms-of-use-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/flows/post-authn/consent/terms-of-use/terms-of-use-beans.xml?rev=6735&r1=6734&r2=6735&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/flows/post-authn/consent/terms-of-use/terms-of-use-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/flows/post-authn/consent/terms-of-use/terms-of-use-beans.xml Fri Oct 17 23:58:58 2014
@@ -24,8 +24,7 @@
     <bean id="SetRPUIInformation" class="net.shibboleth.idp.ui.impl.SetRPUIInformation" scope="prototype"
         p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
 
-    <bean id="IsTermsOfUseConsentRequiredPredicate" class="net.shibboleth.idp.consent.flow.tou.IsTermsOfUseConsentRequiredPredicate"
-        c:consentFunction-ref="TermsOfUseConsentFunction" scope="prototype" />
+    <bean id="IsTermsOfUseConsentRequiredPredicate" class="net.shibboleth.idp.consent.flow.tou.IsTermsOfUseConsentRequiredPredicate" scope="prototype" />
 
     <bean id="ExtractConsent" class="net.shibboleth.idp.consent.flow.ExtractConsent" scope="prototype"
         p:httpServletRequest-ref="shibboleth.HttpServletRequest" />

Modified: trunk/idp-consent/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-consent/pom.xml?rev=6735&r1=6734&r2=6735&view=diff
==============================================================================
--- trunk/idp-consent/pom.xml (original)
+++ trunk/idp-consent/pom.xml Fri Oct 17 23:58:58 2014
@@ -47,6 +47,13 @@
         </dependency>
 
         <!-- Test Dependencies -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>idp-profile-api</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+            <type>test-jar</type>
+        </dependency>
 
         <!-- Managed Dependencies -->
     </dependencies>

Copied: trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/FlowDescriptorLookup.java (from r6734, trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/FlowDescriptorLookupStrategy.java)

[... 50 lines stripped ...]