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

[noreply at shibboleth.net]

Author: tzeller
Date: Wed Oct 22 13:18:20 2014
New Revision: 6768

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6768&view=rev
Log:
Make consent flows abstract. Use message source in flow directory.

Added:
    trunk/idp-conf/src/main/resources/flows/post-authn/consent/attribute-consent/messages.properties
      - copied unchanged from r6765, trunk/idp-conf/src/main/resources/conf/post-authn/attribute-consent_en.properties
    trunk/idp-conf/src/main/resources/system/flows/post-authn/consent/
    trunk/idp-conf/src/main/resources/system/flows/post-authn/consent/attribute-consent-abstract-beans.xml
      - copied unchanged from r6765, trunk/idp-conf/src/main/resources/flows/post-authn/consent/attribute-consent/attribute-consent-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/post-authn/consent/attribute-consent-abstract-flow.xml
      - copied, changed from r6765, trunk/idp-conf/src/main/resources/flows/post-authn/consent/attribute-consent/attribute-consent-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/post-authn/consent/terms-of-use-abstract-beans.xml
      - copied unchanged from r6765, trunk/idp-conf/src/main/resources/flows/post-authn/consent/terms-of-use/terms-of-use-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/post-authn/consent/terms-of-use-abstract-flow.xml
      - copied, changed from r6765, trunk/idp-conf/src/main/resources/flows/post-authn/consent/terms-of-use/terms-of-use-flow.xml
Modified:
    trunk/idp-conf/src/main/resources/conf/post-authn/attribute-consent_en.properties
    trunk/idp-conf/src/main/resources/conf/services.xml
    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/attribute-consent/attribute-consent-flow.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/system/conf/webflow-config.xml

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=6768&r1=6767&r2=6768&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/services.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/services.xml Wed Oct 22 13:18:20 2014
@@ -107,7 +107,6 @@
     -->
     <util:list id="shibboleth.MessageSourceResources">
         <value>%{idp.home}/conf/messages</value>
-        <value>%{idp.home}/conf/post-authn/attribute-consent</value>
     </util:list>
     
 </beans>

Modified: trunk/idp-conf/src/main/resources/flows/post-authn/consent/attribute-consent/attribute-consent-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/flows/post-authn/consent/attribute-consent/attribute-consent-flow.xml?rev=6768&r1=6767&r2=6768&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/flows/post-authn/consent/attribute-consent/attribute-consent-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/flows/post-authn/consent/attribute-consent/attribute-consent-flow.xml Wed Oct 22 13:18:20 2014
@@ -1,162 +1,5 @@
-
 <flow xmlns="http://www.springframework.org/schema/webflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd">
-
-    <!-- Rudimentary impediment to direct execution of subflow. -->
-    <input name="calledAsSubflow" type="boolean" required="true" />
-
-
-    <!-- Attribute consent setup. -->
-
-    <action-state id="AttributeConsentSetup">
-        <evaluate expression="InitializeConsentContext" />
-        <evaluate expression="InitializeAttributeConsentContext" />
-        <evaluate expression="PopulateAttributeConsentContext" />
-        <evaluate expression="SetRPUIInformation" />
-        <evaluate expression="'proceed'" />
-        <transition on="proceed" to="TestForRevokeConsent" />
-    </action-state>
-
-
-    <!-- If consent revocation was requested, skip reading from storage. -->
-
-    <decision-state id="TestForRevokeConsent">
-        <if test="requestParameters._idp_revokeConsent" then="IsAttributeConsentRequired" else="ReadConsentFromStorage" />
-    </decision-state>
-
-
-    <!-- Read consent from storage. -->
-
-    <action-state id="ReadConsentFromStorage">
-        <evaluate expression="ReadConsentFromStorage" />
-        <evaluate expression="'proceed'" />
-        <transition on="proceed" to="TestForReadGlobalAttributeConsentFromStorage" />
-    </action-state>
-
-    <decision-state id="TestForReadGlobalAttributeConsentFromStorage">
-        <if test="flowScope.allowGlobalConsent" then="ReadGlobalAttributeConsentFromStorage" else="IsAttributeConsentRequired" />

[... 258 lines stripped ...]