[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: Thu Oct  2 19:23:47 2014
New Revision: 6618

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6618&view=rev
Log:
Add attribute consent message source and cleanup consent properties in view templates.

Added:
    trunk/idp-conf/src/main/resources/conf/post-authn/attribute-consent_en.properties   (with props)
Modified:
    trunk/idp-conf/src/main/resources/conf/post-authn/post-authn.xml
    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/views/post-authn/consent/attribute-consent.vm
    trunk/idp-conf/src/main/resources/views/post-authn/consent/per-attribute-consent.vm
    trunk/idp-conf/src/main/resources/views/post-authn/consent/terms-of-use.vm

Modified: 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/post-authn.xml?rev=6618&r1=6617&r2=6618&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/post-authn/post-authn.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/post-authn/post-authn.xml Thu Oct  2 19:23:47 2014
@@ -37,8 +37,8 @@
         p:storageService-ref="shibboleth.ClientStorageService"
         p:storageKeyLookupStrategy-ref="StorageKeyLookupFunction"
         p:compareValues="true"
-        p:idMessageCode="tou.id"
-        p:textMessageCode="tou.text"
+        p:idMessageCode="idp.tou.id"
+        p:textMessageCode="idp.tou.text"
         scope="prototype" />
 
     <bean id="Consent.Conditions.RelyingPartyID" parent="shibboleth.Conditions.RelyingPartyId">
@@ -52,6 +52,5 @@
     <bean id="StorageKeyLookupFunction" class="net.shibboleth.idp.consent.logic.StorageKeyLookupFunction" scope="prototype"
         c:attributeId="email" />
     -->
-    
 
 </beans>

Modified: trunk/idp-conf/src/main/resources/conf/post-authn/terms-of-use_en.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/post-authn/terms-of-use_en.properties?rev=6618&r1=6617&r2=6618&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/post-authn/terms-of-use_en.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/post-authn/terms-of-use_en.properties Thu Oct  2 19:23:47 2014
@@ -1,47 +1,36 @@
 # Messages related to Terms of Use consent.
 
-# TODO change prefix to idp.tou ?
+idp.tou.title = Terms of Use
 
-#######################################################################
-### Terms of Use configuration                                      ###
-#######################################################################
+idp.tou.accept = I accept the terms of use
 
-# Indicates whether the Terms of Use Module is enabled or not.
-# tou.enabled                 = false
+idp.tou.submit = Confirm
 
-tou.title = Terms of Use
+idp.tou.id = 1.0
 
-tou.accept = I accept the terms of use
-
-tou.submit = Confirm
-
-# The terms of use identifier.
-tou.id = 1.0
-
-# The terms of use text.
-tou.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. \

[... 117 lines stripped ...]