[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/errors.xml conf/intercept/messages.proper...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Nov 20 16:57:01 2014
New Revision: 6975

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6975&view=rev
Log:
Add second Reject event for terms of use.

Modified:
    trunk/idp-conf/src/main/resources/conf/errors.xml
    trunk/idp-conf/src/main/resources/conf/intercept/messages.properties
    trunk/idp-conf/src/main/resources/conf/messages.properties
    trunk/idp-conf/src/main/resources/system/flows/intercept/intercept-abstract-flow.xml
    trunk/idp-conf/src/main/resources/views/intercept/attribute-release.vm
    trunk/idp-conf/src/main/resources/views/intercept/terms-of-use.vm

Modified: trunk/idp-conf/src/main/resources/conf/errors.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/errors.xml?rev=6975&r1=6974&r2=6975&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/errors.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/errors.xml Thu Nov 20 16:57:01 2014
@@ -11,13 +11,8 @@
 
     <bean id="shibboleth.DefaultErrorView" class="java.lang.String" c:_0="%{idp.errors.defaultView:error}" />
 
-    <!-- If desired, map events to alternate error view templates. -->
+    <!-- Map local events to alternate view templates. -->
     <util:map id="shibboleth.EventViewMap">
-    <!--
-        <entry key="MessageReplay" value="stale-error" />
-        <entry key="MessageExpired" value="stale-error" />
-        <entry key="UnableToDecode" value="stale-error" />
-    -->
         <!-- Handles final result of SAML 2 LogoutResponse messages. -->
         <entry key="LogoutResponse" value="logout-response" />
     </util:map>
@@ -25,7 +20,8 @@
     <!-- List of events to trap and handle with local views, without returning to SPs. -->
     <util:list id="shibboleth.LocalEvents">
         <value>ContextCheckDenied</value>
-        <value>NoConsent</value>
+        <value>AttributeReleaseRejected</value>
+        <value>TermsRejected</value>
         <value>RuntimeException</value>
         <!--
         <value>IdentitySwitch</value>

Modified: trunk/idp-conf/src/main/resources/conf/intercept/messages.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/intercept/messages.properties?rev=6975&r1=6974&r2=6975&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/intercept/messages.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/intercept/messages.properties Thu Nov 20 16:57:01 2014
@@ -13,7 +13,9 @@
 
 idp.terms-of-use.accept     = I accept the terms of use
 
-idp.terms-of-use.submit     = Confirm
+idp.terms-of-use.submit     = Submit
+
+idp.terms-of-use.reject     = Refuse
 
 idp.terms-of-use.required   = Please check this box if you want to proceed.
 

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=6975&r1=6974&r2=6975&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/messages.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/messages.properties Thu Nov 20 16:57:01 2014
@@ -38,7 +38,8 @@
 UnableToSign = unexpected
 UnableToEncrypt = unexpected
 
-NoConsent = no-consent
+AttributeReleaseRejected = no-release
+TermsRejected = no-terms
 
 RuntimeException = runtime-error
 
@@ -54,10 +55,15 @@
 context-check-denied.title = Access Denied
 context-check-denied.message = You are not eligible for the service requested.
 
-no-consent.title = Release of Information Prevented
-no-consent.message = At your request, the release of your information has been blocked. If you wish to \
+no-release.title = Release of Information Prevented
+no-release.message = At your request, the release of your information has been blocked. If you wish to \
                       change your decision, you may access the service again and approve the release in the \
                       future.
+
+no-terms.title = Terms of Use Refused
+no-terms.message = Having refused the mandatory Terms of Use, access to the service is not permitted. \
+                    If you wish to change your decision, you may access the service again and approve  \
+                    the terms in the future. 
 
 async-logout.title = Logout Completed
 async-logout.message = Logout complete. Service provider requested no response.

Modified: trunk/idp-conf/src/main/resources/system/flows/intercept/intercept-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/intercept/intercept-abstract-flow.xml?rev=6975&r1=6974&r2=6975&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/intercept/intercept-abstract-flow.xml (original)

[... 65 lines stripped ...]