[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/conf/post-authn/terms-of-use_en.properties idp...

[noreply at shibboleth.net]

Author: tzeller
Date: Thu Oct 16 22:53:37 2014
New Revision: 6731

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6731&view=rev
Log:
Checkpoint work on terms of use consent.
Move message source property file to flow directory and remove from services.xml.
Remove terms of use context and flow descriptor.
Replace action with predicate to determine if consent is required.
Do not store terms of use text.

Added:
    trunk/idp-conf/src/main/resources/flows/post-authn/consent/terms-of-use/messages.properties   (with props)
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/PopulateCurrentConsents.java   (with props)
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/tou/IsTermsOfUseConsentRequiredPredicate.java   (with props)
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/tou/TermsOfUseConsentFunction.java   (with props)
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/FlowDescriptorLookupStrategy.java   (with props)
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/HashFunction.java
      - copied, changed from r6614, trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/TermsOfUseHashFunction.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/LocaleLookupStrategy.java   (with props)
Modified:
    trunk/idp-conf/src/main/resources/conf/post-authn/terms-of-use_en.properties
    trunk/idp-conf/src/main/resources/conf/services.xml
    trunk/idp-conf/src/main/resources/flows/post-authn/consent/terms-of-use/terms-of-use-beans.xml
    trunk/idp-conf/src/main/resources/flows/post-authn/consent/terms-of-use/terms-of-use-flow.xml
    trunk/idp-conf/src/main/resources/views/post-authn/consent/terms-of-use.vm
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/context/ConsentContext.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/context/TermsOfUseContext.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ConsentFlowDescriptor.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/tou/AbstractTermsOfUseAction.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/tou/CreateTermsOfUseChoice.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/tou/InitializeTermsOfUseContext.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/tou/IsTermsOfUseConsentRequired.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/tou/PopulateTermsOfUse.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/tou/TermsOfUse.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/tou/TermsOfUseFlowDescriptor.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/tou/package-info.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/TermsOfUseHashFunction.java

Modified: trunk/idp-conf/src/main/resources/conf/services.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/services.xml?rev=6731&r1=6730&r2=6731&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/services.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/services.xml Thu Oct 16 22:53:37 2014
@@ -107,7 +107,6 @@
     -->
     <util:list id="shibboleth.MessageSourceResources">
         <value>%{idp.home}/conf/messages</value>
-        <value>%{idp.home}/conf/post-authn/terms-of-use</value>
         <value>%{idp.home}/conf/post-authn/attribute-consent</value>
     </util:list>
     

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=6731&r1=6730&r2=6731&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 Thu Oct 16 22:53:37 2014
@@ -11,23 +11,26 @@
     <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
     <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
 
+    <bean id="TermsOfUseConsentFunction" class="net.shibboleth.idp.consent.flow.tou.TermsOfUseConsentFunction" scope="prototype" />
+
     <bean id="InitializeConsentContext" class="net.shibboleth.idp.consent.flow.InitializeConsentContext" scope="prototype" />
 
-    <bean id="InitializeTermsOfUseContext" class="net.shibboleth.idp.consent.flow.tou.InitializeTermsOfUseContext" scope="prototype" />
+    <bean id="PopulateCurrentConsents" class="net.shibboleth.idp.consent.flow.PopulateCurrentConsents" scope="prototype"
+        c:currentConsentsFunction-ref="TermsOfUseConsentFunction"  />
 

[... 287 lines stripped ...]