[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: messages/authn-messages.properties messages/er...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Oct 28 12:17:35 2015
New Revision: 7896

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7896&view=rev
Log:
IDP-224 - Add some i18n to logout views, wire up new views to SAML logout flow

Modified:
    trunk/idp-conf/src/main/resources/messages/authn-messages.properties
    trunk/idp-conf/src/main/resources/messages/error-messages.properties
    trunk/idp-conf/src/main/resources/system/flows/logout/logout-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-flow.xml
    trunk/idp-conf/src/main/resources/views/logout-complete.vm
    trunk/idp-conf/src/main/resources/views/logout-propagate.vm
    trunk/idp-conf/src/main/resources/views/logout.vm

Modified: trunk/idp-conf/src/main/resources/messages/authn-messages.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/messages/authn-messages.properties?rev=7896&r1=7895&r2=7896&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/messages/authn-messages.properties	(original)
+++ trunk/idp-conf/src/main/resources/messages/authn-messages.properties	Wed Oct 28 12:17:35 2015
@@ -55,4 +55,18 @@
 spnego-unavailable.message = Your web browser doesn't support authentication with your desktop login credentials.
 spnego-unavailable.return = Cancel the attempt.
 
-ntlm.message = Your web browser attempted to negotiate a weaker form of desktop authentication.
+ntlm.message = Your web browser attempted to negotiate a weaker form of desktop authentication.
+
+# Logout-related messages
+
+idp.logout.ask = Would you like to attempt to log out of all services accessed during your session?
+idp.logout.contactServices = If you proceed, the system will attempt to contact the following services:
+idp.logout.complete = The logout operation is complete, and no other services appear to have been accessed during this session.
+idp.logout.local = You elected not to log out of all the applications accessed during your session.
+idp.logout.attempt = Attempting to log out of the following services:
+
+AsyncLogout = async-logout
+
+async-logout.title = Logout Completed
+async-logout.message = Logout complete. Service provider requested no response.
+

Modified: trunk/idp-conf/src/main/resources/messages/error-messages.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/messages/error-messages.properties?rev=7896&r1=7895&r2=7896&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/messages/error-messages.properties	(original)
+++ trunk/idp-conf/src/main/resources/messages/error-messages.properties	Wed Oct 28 12:17:35 2015
@@ -17,7 +17,6 @@
 
 AccessDenied = access
 ContextCheckDenied = context-check-denied
-AsyncLogout = async-logout
 EndpointResolutionFailed = endpoint
 InvalidProfileConfiguration = relying-party
 InvalidSecurityConfiguration = security-cfg
@@ -71,9 +70,6 @@
                     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.
-
 authn.title = Login Failed
 authn.message = User login was not successful or could not meet the requirements of the requesting application.
 

Modified: trunk/idp-conf/src/main/resources/system/flows/logout/logout-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/logout/logout-flow.xml?rev=7896&r1=7895&r2=7896&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/logout/logout-flow.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/logout/logout-flow.xml	Wed Oct 28 12:17:35 2015
@@ -92,7 +92,6 @@
     <end-state id="LogoutPropagateView" view="logout-propagate">
         <on-entry>
             <evaluate expression="SaveLogoutContext" />
-            <evaluate expression="WriteAuditLog" />
             <evaluate expression="environment" result="requestScope.environment" />
             <evaluate expression="opensamlProfileRequestContext" result="requestScope.profileRequestContext" />
             <evaluate expression="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.session.context.LogoutContext))" result="requestScope.logoutContext" />
@@ -109,7 +108,6 @@
 
     <end-state id="LogoutCompleteView" view="logout-complete">
         <on-entry>
-            <evaluate expression="WriteAuditLog" />
             <evaluate expression="environment" result="requestScope.environment" />
             <evaluate expression="opensamlProfileRequestContext" result="requestScope.profileRequestContext" />

[... 202 lines stripped ...]