[java-identity-provider COMMIT] /trunk/idp-war/src/main/webapp/WEB-INF/jsp/logout.jsp

[noreply at shibboleth.net]

Author: scantor
Date: Tue Sep  9 14:23:57 2014
New Revision: 6519

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6519&view=rev
Log:
IDP-224 - Fix up JSP view and revise to use taglib again.

Modified:
    trunk/idp-war/src/main/webapp/WEB-INF/jsp/logout.jsp

Modified: trunk/idp-war/src/main/webapp/WEB-INF/jsp/logout.jsp
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-war/src/main/webapp/WEB-INF/jsp/logout.jsp?rev=6519&r1=6518&r2=6519&view=diff
==============================================================================
--- trunk/idp-war/src/main/webapp/WEB-INF/jsp/logout.jsp (original)
+++ trunk/idp-war/src/main/webapp/WEB-INF/jsp/logout.jsp Tue Sep  9 14:23:57 2014
@@ -3,6 +3,7 @@
 <%@ taglib uri="urn:mace:shibboleth:2.0:idp:ui" prefix="idpui" %>
 <%@ page import="org.opensaml.profile.context.ProfileRequestContext" %>
 <%@ page import="net.shibboleth.idp.profile.context.MultiRelyingPartyContext" %>
+<%@ page import="net.shibboleth.idp.profile.context.RelyingPartyContext" %>
 <%@ page import="net.shibboleth.idp.session.SPSession" %>
 <%@ page import="net.shibboleth.idp.session.context.LogoutContext" %>
 <%@ page import="net.shibboleth.idp.ui.context.RelyingPartyUIContext" %>
@@ -51,13 +52,14 @@
                     if (rpCtx != null) {
                         rpUIContext = rpCtx.getSubcontext(RelyingPartyUIContext.class);
                     }
-                    if (rpUIContext != null && rpUIContext.getServiceName() != null) {
+                    if (rpUIContext != null) {
                 %>
-                    <li><%= HTMLEncoder.encodeForHTML(rpUIContext.getServiceName()) %></li>
-                <% } else { %>
-                    <li><%= HTMLEncoder.encodeForHTML(sp) %></li>
+                        <li><idpui:serviceName uiContext="<%= rpUIContext %>" /></li>
+                    <% } else { %>
+                        <li><%= HTMLEncoder.encodeForHTML(sp) %></li>
+				    <% } %>
 				<% } %>
-			    </ul>	
+			    </ul>
 			<% } %>
           </div>
           <div class="column two">