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

[noreply at shibboleth.net]

Author: tzeller
Date: Wed Oct 22 13:45:12 2014
New Revision: 6769

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6769&view=rev
Log:
Flatten consent flows by removing "consent" directories.

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

Modified: trunk/idp-conf/src/main/resources/conf/idp.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/idp.properties?rev=6769&r1=6768&r2=6769&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Wed Oct 22 13:45:12 2014
@@ -164,4 +164,4 @@
 idp.reload.accessPolicy = AccessByIPAddress
 
 # Regular expression matching post-authn flows to enable
-#idp.post-authn.flows = consent/terms-of-use|consent/attribute-consent
+#idp.post-authn.flows = terms-of-use|attribute-consent

Copied: trunk/idp-conf/src/main/resources/conf/post-authn.xml (from r6767, trunk/idp-conf/src/main/resources/conf/post-authn/post-authn.xml)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/post-authn.xml?p2=trunk/idp-conf/src/main/resources/conf/post-authn.xml&p1=trunk/idp-conf/src/main/resources/conf/post-authn/post-authn.xml&r1=6767&r2=6769&rev=6769&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/post-authn/post-authn.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/post-authn.xml Wed Oct 22 13:45:12 2014
@@ -15,9 +15,9 @@
     <!-- Flows executed after authentication. -->
     <util:list id="shibboleth.PostAuthnFlows">
 
-        <bean id="post-authn/consent/terms-of-use" parent="shibboleth.consent.TermsOfUseFlow" />
+        <bean id="post-authn/terms-of-use" parent="shibboleth.consent.TermsOfUseFlow" />
 

[... 66 lines stripped ...]