[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/intercept/ conf/intercept/intercept-event...

[noreply at shibboleth.net]

Author: scantor
Date: Sun Nov  2 16:53:07 2014
New Revision: 6818

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6818&view=rev
Log:
Move intercept config into subfolder, create dedicated message source, create a special parent flow to hold user-supplied end-states.

Added:
    trunk/idp-conf/src/main/resources/conf/intercept/
    trunk/idp-conf/src/main/resources/conf/intercept/intercept-events-flow.xml   (with props)
    trunk/idp-conf/src/main/resources/conf/intercept/messages.properties   (with props)
    trunk/idp-conf/src/main/resources/conf/intercept/profile-intercept.xml
      - copied unchanged from r6816, trunk/idp-conf/src/main/resources/conf/profile-intercept.xml
Modified:
    trunk/idp-conf/src/main/resources/conf/messages.properties
    trunk/idp-conf/src/main/resources/conf/profile-intercept.xml
    trunk/idp-conf/src/main/resources/conf/services.xml
    trunk/idp-conf/src/main/resources/flows/intercept/
    trunk/idp-conf/src/main/resources/system/conf/profile-intercept-system.xml
    trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml
    trunk/idp-conf/src/main/resources/system/flows/intercept/intercept-abstract-flow.xml

Modified: trunk/idp-conf/src/main/resources/conf/messages.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/messages.properties?rev=6818&r1=6817&r2=6818&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/messages.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/messages.properties Sun Nov  2 16:53:07 2014
@@ -82,82 +82,3 @@
 
 error.title = Error
 error.message = An error occurred: $eventId
-
-
-# Messages related to terms of use consent.
-
-idp.terms-of-use.title      = Terms of Use
-
-idp.terms-of-use.accept     = I accept the terms of use
-
-idp.terms-of-use.submit     = Confirm
-
-idp.terms-of-use.required   = Please check this box if you want to proceed.
-
-idp.terms-of-use.id         = Terms of Use 1.0
-
-idp.terms-of-use.text = <em>*** This is an example ToU - tailor due to your needs ***</em> \
-                        <p>Example organization AAI services: Terms of Use (ToU)</p> \
-                        <strong>A. Data Protection Sample Clause</strong> \
-                        <p> \
-                        "The End User notes that personal data about the End User is compiled from generally \
-                        available sources and from communications received from the End User and other \
-                        Universities as well as from off-site sources. The policy relating to the use and procession \
-                        of such data is posted on the University website at [...]. Such data will be used, inter alia, \
-                        to authenticate and authorize the access to and use of various resources within \
-                        the University and on other sites ("Approved Uses"). The End User hereby consents to \
-                        the collection, processing, use and release of such data to the extent reasonably necessary \
-                        for the Approved Uses. Such consent includes, but is not limited to, the release \
-                        of personal data to other institutions by employing cookies and electronically exchanging, \
-                        caching and storing personal authorization attributes." \
-                        </p> \
-                        <strong>B. Limitation of Liability</strong> \
-                        <p> \
-                        "To the extent permitted by the applicable law, the End User hereby waives all and any \
-                        claims for cost and damages, whether direct or indirect, incidental, or consequential(including, \
-                        inter alia, loss of use and lost profits), both in contract and in tort, arising from \
-                        the use or in any way related to the inter-organizational authentication and authorization \
-                        services which allow the End User to access certain resources of other organizations. \
-                        This waiver of claims shall be valid and effective in relation to all participants of \
-                        the inter-organizational authentication and authorization services including the AAI \
-                        Service Provider and its affiliates, officers, employees and agents." \
-                        </p>
-
-# Messages related to attribute release consent.
-
-idp.attribute-release.title                        = Attribute Release
-
-idp.attribute-release.attributesHeader             = Data Requested by Service
-
-idp.attribute-release.serviceNameLabel             = You are about to access the service:
-idp.attribute-release.of                           = of
-idp.attribute-release.serviceDescriptionLabel      = Description as provided by this service:
-
-idp.attribute-release.informationURLLabel          = Additional information about the service

[... 86 lines stripped ...]