[portal-commits] JBoss Portal SVN: r9667 - in branches/JBoss_Portal_Branch_2_6/core/src/resources: portal-server-war/WEB-INF and 1 other directory.
Author: sohil.shah(a)jboss.com
Date: 2008-01-31 01:23:15 -0500 (Thu, 31 Jan 2008)
New Revision: 9667
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/WEB-INF/context.xml
Log:
JBPORTAL-1848 - Portal CAS integration does not invalidate the CAS token
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2008-01-31
06:19:23 UTC (rev 9666)
+++
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2008-01-31
06:23:15 UTC (rev 9667)
@@ -16,6 +16,8 @@
if (user == null)
{
%>
+
+<%if(request.getAttribute("ssoEnabled") == null){%>
<script type="text/javascript">
if (typeof isModalLoaded != 'undefined'){
document.write('<a href=\"#\"
onclick=\"alertModal(\'login-modal\',\'login-modal-msg\');return
false;\">Login</a>');
@@ -30,6 +32,9 @@
<noscript>
<a href="<%= loginURL %>">Login</a>
</noscript>
+<%}else{%>
+<a href="<%= loginURL %>">Login</a>
+<%}%>
<%
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/WEB-INF/context.xml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/WEB-INF/context.xml 2008-01-31
06:19:23 UTC (rev 9666)
+++
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/WEB-INF/context.xml 2008-01-31
06:23:15 UTC (rev 9667)
@@ -10,6 +10,7 @@
<!--
<Valve
className="org.jboss.portal.identity.sso.cas.CASAuthenticationValve"
casLogin="https://localhost/cas/login"
+ casLogout="https://localhost/cas/logout"
casValidate="https://localhost/cas/serviceValidate"
casServerName="localhost"
authType="FORM"