gatein SVN: r2478 - portal/trunk/testsuite.
by do-not-reply＠jboss.org
Author: arthurpeltier
Date: 2010-04-05 23:52:26 -0400 (Mon, 05 Apr 2010)
New Revision: 2478
Modified:
portal/trunk/testsuite/GateIn_v3.0_MainFucntions_TestDefinition.ods
Log:
GTNPORTAL-775 : * Created new tests and updated TestDefinition
Modified: portal/trunk/testsuite/GateIn_v3.0_MainFucntions_TestDefinition.ods
===================================================================
(Binary files differ)
14 years, 9 months
gatein SVN: r2477 - components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter.
by do-not-reply＠jboss.org
Author: sohil.shah(a)jboss.com
Date: 2010-04-05 17:31:38 -0400 (Mon, 05 Apr 2010)
New Revision: 2477
Modified:
components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/LoginRedirectFilter.java
Log:
GTNPORTAL-997 - SSO integration: after click to "Sign in" is shown dialog (UILoginForm.gtmpl) and SSO console a while after it
Modified: components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/LoginRedirectFilter.java
===================================================================
--- components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/LoginRedirectFilter.java 2010-04-05 21:20:30 UTC (rev 2476)
+++ components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/LoginRedirectFilter.java 2010-04-05 21:31:38 UTC (rev 2477)
@@ -32,9 +32,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-//Works for GateIn Portal Login Url = {AnyURL}?portal:componentId=UIPortal&portal:action=ShowLoginForm&ajaxRequest=true
-
/**
* @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
*/
14 years, 9 months
gatein SVN: r2476 - components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter.
by do-not-reply＠jboss.org
Author: sohil.shah(a)jboss.com
Date: 2010-04-05 17:20:30 -0400 (Mon, 05 Apr 2010)
New Revision: 2476
Added:
components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/LoginRedirectFilter.java
Log:
GTNPORTAL-997 - SSO integration: after click to "Sign in" is shown dialog (UILoginForm.gtmpl) and SSO console a while after it
Added: components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/LoginRedirectFilter.java
===================================================================
--- components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/LoginRedirectFilter.java (rev 0)
+++ components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/LoginRedirectFilter.java 2010-04-05 21:20:30 UTC (rev 2476)
@@ -0,0 +1,82 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.gatein.sso.agent.filter;
+
+import java.io.IOException;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+//Works for GateIn Portal Login Url = {AnyURL}?portal:componentId=UIPortal&portal:action=ShowLoginForm&ajaxRequest=true
+
+
+/**
+ * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
+ */
+public class LoginRedirectFilter implements Filter
+{
+ private String loginUrl;
+
+ public void init(FilterConfig config) throws ServletException
+ {
+ this.loginUrl = config.getInitParameter("LOGIN_URL");
+ }
+
+ public void destroy()
+ {
+ }
+
+ public void doFilter(ServletRequest request, ServletResponse response,
+ FilterChain chain) throws IOException, ServletException
+ {
+ HttpServletRequest httpRequest = (HttpServletRequest) request;
+ HttpServletResponse httpResponse = (HttpServletResponse) response;
+
+ boolean isLoginInProgress = this.isLoginInProgress(httpRequest);
+ if(isLoginInProgress)
+ {
+ httpResponse.sendRedirect(this.loginUrl);
+
+ return;
+ }
+
+ chain.doFilter(request, response);
+ }
+
+ private boolean isLoginInProgress(HttpServletRequest request)
+ {
+ String action = request.getRequestURI();
+
+ if (action != null && action.equals("/portal/sso"))
+ {
+ return true;
+ }
+
+ return false;
+ }
+}
14 years, 9 months
gatein SVN: r2475 - components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter.
by do-not-reply＠jboss.org
Author: sohil.shah(a)jboss.com
Date: 2010-04-05 13:59:36 -0400 (Mon, 05 Apr 2010)
New Revision: 2475
Added:
components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/AbstractLogoutFilter.java
Modified:
components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/JOSSOLogoutFilter.java
components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/OpenSSOLogoutFilter.java
Log:
GTNPORTAL-996 - GateIn+JOSSO integration: Problems with logout
Added: components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/AbstractLogoutFilter.java
===================================================================
--- components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/AbstractLogoutFilter.java (rev 0)
+++ components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/AbstractLogoutFilter.java 2010-04-05 17:59:36 UTC (rev 2475)
@@ -0,0 +1,92 @@
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.gatein.sso.agent.filter;
+
+import java.io.IOException;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
+ */
+public abstract class AbstractLogoutFilter implements Filter
+{
+ protected String logoutUrl;
+
+ public void init(FilterConfig config) throws ServletException
+ {
+ this.logoutUrl = config.getInitParameter("LOGOUT_URL");
+ }
+
+ public void destroy()
+ {
+ }
+
+ public void doFilter(ServletRequest request, ServletResponse response,
+ FilterChain chain) throws IOException, ServletException
+ {
+ HttpServletRequest httpRequest = (HttpServletRequest) request;
+ HttpServletResponse httpResponse = (HttpServletResponse) response;
+
+ boolean isLogoutInProgress = this.isLogoutInProgress(httpRequest);
+
+ if (isLogoutInProgress)
+ {
+
+ if (httpRequest.getSession().getAttribute("SSO_LOGOUT_FLAG") == null)
+ {
+ httpRequest.getSession().setAttribute("SSO_LOGOUT_FLAG", Boolean.TRUE);
+
+ httpResponse.sendRedirect(this.getRedirectUrl(httpRequest));
+ return;
+ }
+ else
+ {
+ // clear the LOGOUT flag
+ httpRequest.getSession().removeAttribute("SSO_LOGOUT_FLAG");
+ }
+ }
+
+ chain.doFilter(request, response);
+ }
+
+ private boolean isLogoutInProgress(HttpServletRequest request)
+ {
+ String action = request.getParameter("portal:action");
+
+ if (action != null && action.equals("Logout"))
+ {
+ return true;
+ }
+
+ return false;
+ }
+
+ protected abstract String getRedirectUrl(HttpServletRequest httpRequest);
+}
Modified: components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/JOSSOLogoutFilter.java
===================================================================
--- components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/JOSSOLogoutFilter.java 2010-04-05 16:39:25 UTC (rev 2474)
+++ components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/JOSSOLogoutFilter.java 2010-04-05 17:59:36 UTC (rev 2475)
@@ -21,17 +21,8 @@
*/
package org.gatein.sso.agent.filter;
-import java.io.IOException;
import java.net.URLEncoder;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
//Works for GateIn Portal Logout URL = {AnyURL}?portal:componentId=UIPortal&portal:action=Logout
@@ -45,7 +36,7 @@
* <filter-class>org.gatein.sso.agent.filter.JOSSOLogoutFilter</filter-class>
* <init-param>
* <!-- This should point to your JOSSO authentication server -->
- * <param-name>JOSSO_LOGOUT_URL</param-name>
+ * <param-name>LOGOUT_URL</param-name>
* <param-value>http://localhost:8888/josso/signon/logout.do</param-value>
* </init-param>
* </filter>
@@ -63,56 +54,23 @@
/**
* @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
*/
-public class JOSSOLogoutFilter implements Filter
+public class JOSSOLogoutFilter extends AbstractLogoutFilter
{
- private String jossoLogoutUrl;
-
- public void init(FilterConfig config) throws ServletException
+ protected String getRedirectUrl(HttpServletRequest httpRequest)
{
- this.jossoLogoutUrl = config.getInitParameter("JOSSO_LOGOUT_URL");
- }
-
- public void destroy()
- {
- }
-
- public void doFilter(ServletRequest request, ServletResponse response,
- FilterChain chain) throws IOException, ServletException
- {
- HttpServletRequest httpRequest = (HttpServletRequest)request;
- HttpServletResponse httpResponse = (HttpServletResponse)response;
-
- boolean isLogoutInProgress = this.isLogoutInProgress(httpRequest);
-
- if(isLogoutInProgress)
+ try
{
-
- if(httpRequest.getSession().getAttribute("SSO_LOGOUT_FLAG") == null)
- {
- httpRequest.getSession().setAttribute("SSO_LOGOUT_FLAG", Boolean.TRUE);
- String parameters = URLEncoder.encode("portal:componentId=UIPortal&portal:action=Logout", "UTF-8");
- httpResponse.sendRedirect(jossoLogoutUrl+"?josso_back_to="+httpRequest.getRequestURL()+"?"+parameters);
- return;
- }
- else
- {
- //clear the LOGOUT flag
- httpRequest.getSession().removeAttribute("SSO_LOGOUT_FLAG");
- }
+ String parameters = URLEncoder.encode(
+ "portal:componentId=UIPortal&portal:action=Logout", "UTF-8");
+
+ String redirectUrl = this.logoutUrl + "?josso_back_to="
+ + httpRequest.getRequestURL() + "?" + parameters;
+
+ return redirectUrl;
}
-
- chain.doFilter(request, response);
- }
-
- private boolean isLogoutInProgress(HttpServletRequest request)
- {
- String action = request.getParameter("portal:action");
-
- if(action != null && action.equals("Logout"))
+ catch(Exception e)
{
- return true;
+ throw new RuntimeException(e);
}
-
- return false;
}
}
Modified: components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/OpenSSOLogoutFilter.java
===================================================================
--- components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/OpenSSOLogoutFilter.java 2010-04-05 16:39:25 UTC (rev 2474)
+++ components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/OpenSSOLogoutFilter.java 2010-04-05 17:59:36 UTC (rev 2475)
@@ -21,17 +21,8 @@
*/
package org.gatein.sso.agent.filter;
-import java.io.IOException;
import java.net.URLEncoder;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
//Works for GateIn Portal Logout URL = {AnyURL}?portal:componentId=UIPortal&portal:action=Logout
@@ -45,13 +36,13 @@
* <filter-class>org.gatein.sso.agent.filter.OpenSSOLogoutFilter</filter-class>
* <init-param>
* <!-- This should point to your OpenSSO authentication server -->
- * <param-name>OPENSSO_LOGOUT_URL</param-name>
+ * <param-name>LOGOUT_URL</param-name>
* <param-value>http://localhost:8888/opensso/UI/Logout</param-value>
* </init-param>
* </filter>
*
* <filter-mapping>
- * <filter-name>JOSSOLogoutFilter</filter-name>
+ * <filter-name>OpenSSOLogoutFilter</filter-name>
* <url-pattern>/*</url-pattern>
* </filter-mapping>
*
@@ -63,56 +54,22 @@
/**
* @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
*/
-public class OpenSSOLogoutFilter implements Filter
-{
- private String logoutUrl;
-
- public void init(FilterConfig config) throws ServletException
+public class OpenSSOLogoutFilter extends AbstractLogoutFilter
+{
+ protected String getRedirectUrl(HttpServletRequest httpRequest)
{
- this.logoutUrl = config.getInitParameter("OPENSSO_LOGOUT_URL");
- }
-
- public void destroy()
- {
- }
-
- public void doFilter(ServletRequest request, ServletResponse response,
- FilterChain chain) throws IOException, ServletException
- {
- HttpServletRequest httpRequest = (HttpServletRequest)request;
- HttpServletResponse httpResponse = (HttpServletResponse)response;
-
- boolean isLogoutInProgress = this.isLogoutInProgress(httpRequest);
-
- if(isLogoutInProgress)
+ try
{
-
- if(httpRequest.getSession().getAttribute("SSO_LOGOUT_FLAG") == null)
- {
- httpRequest.getSession().setAttribute("SSO_LOGOUT_FLAG", Boolean.TRUE);
- String parameters = URLEncoder.encode("portal:componentId=UIPortal&portal:action=Logout", "UTF-8");
- httpResponse.sendRedirect(this.logoutUrl+"?realm=gatein&goto="+httpRequest.getRequestURL()+"?"+parameters);
- return;
- }
- else
- {
- //clear the LOGOUT flag
- httpRequest.getSession().removeAttribute("SSO_LOGOUT_FLAG");
- }
+ String parameters = URLEncoder.encode(
+ "portal:componentId=UIPortal&portal:action=Logout", "UTF-8");
+
+ String redirectUrl = this.logoutUrl+"?realm=gatein&goto="+httpRequest.getRequestURL()+"?"+parameters;
+
+ return redirectUrl;
}
-
- chain.doFilter(request, response);
- }
-
- private boolean isLogoutInProgress(HttpServletRequest request)
- {
- String action = request.getParameter("portal:action");
-
- if(action != null && action.equals("Logout"))
+ catch(Exception e)
{
- return true;
+ throw new RuntimeException(e);
}
-
- return false;
}
}
14 years, 9 months
gatein SVN: r2474 - components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter.
by do-not-reply＠jboss.org
Author: sohil.shah(a)jboss.com
Date: 2010-04-05 12:39:25 -0400 (Mon, 05 Apr 2010)
New Revision: 2474
Added:
components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/OpenSSOLogoutFilter.java
Modified:
components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/JOSSOLogoutFilter.java
Log:
Adding support for OpenSSO Logout
Modified: components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/JOSSOLogoutFilter.java
===================================================================
--- components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/JOSSOLogoutFilter.java 2010-04-05 09:53:23 UTC (rev 2473)
+++ components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/JOSSOLogoutFilter.java 2010-04-05 16:39:25 UTC (rev 2474)
@@ -42,7 +42,7 @@
*
* <filter>
* <filter-name>JOSSOLogoutFilter</filter-name>
- * <filter-class>org.gatein.sso.agent.filter.SSOLogoutFilter</filter-class>
+ * <filter-class>org.gatein.sso.agent.filter.JOSSOLogoutFilter</filter-class>
* <init-param>
* <!-- This should point to your JOSSO authentication server -->
* <param-name>JOSSO_LOGOUT_URL</param-name>
Added: components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/OpenSSOLogoutFilter.java
===================================================================
--- components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/OpenSSOLogoutFilter.java (rev 0)
+++ components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/OpenSSOLogoutFilter.java 2010-04-05 16:39:25 UTC (rev 2474)
@@ -0,0 +1,118 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.gatein.sso.agent.filter;
+
+import java.io.IOException;
+import java.net.URLEncoder;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+//Works for GateIn Portal Logout URL = {AnyURL}?portal:componentId=UIPortal&portal:action=Logout
+
+/**
+ * Usage:
+ *
+ * Add the following to portal.war/WEB-INF/web.xml
+ *
+ * <filter>
+ * <filter-name>OpenSSOLogoutFilter</filter-name>
+ * <filter-class>org.gatein.sso.agent.filter.OpenSSOLogoutFilter</filter-class>
+ * <init-param>
+ * <!-- This should point to your OpenSSO authentication server -->
+ * <param-name>OPENSSO_LOGOUT_URL</param-name>
+ * <param-value>http://localhost:8888/opensso/UI/Logout</param-value>
+ * </init-param>
+ * </filter>
+ *
+ * <filter-mapping>
+ * <filter-name>JOSSOLogoutFilter</filter-name>
+ * <url-pattern>/*</url-pattern>
+ * </filter-mapping>
+ *
+ *
+ *
+ */
+
+
+/**
+ * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
+ */
+public class OpenSSOLogoutFilter implements Filter
+{
+ private String logoutUrl;
+
+ public void init(FilterConfig config) throws ServletException
+ {
+ this.logoutUrl = config.getInitParameter("OPENSSO_LOGOUT_URL");
+ }
+
+ public void destroy()
+ {
+ }
+
+ public void doFilter(ServletRequest request, ServletResponse response,
+ FilterChain chain) throws IOException, ServletException
+ {
+ HttpServletRequest httpRequest = (HttpServletRequest)request;
+ HttpServletResponse httpResponse = (HttpServletResponse)response;
+
+ boolean isLogoutInProgress = this.isLogoutInProgress(httpRequest);
+
+ if(isLogoutInProgress)
+ {
+
+ if(httpRequest.getSession().getAttribute("SSO_LOGOUT_FLAG") == null)
+ {
+ httpRequest.getSession().setAttribute("SSO_LOGOUT_FLAG", Boolean.TRUE);
+ String parameters = URLEncoder.encode("portal:componentId=UIPortal&portal:action=Logout", "UTF-8");
+ httpResponse.sendRedirect(this.logoutUrl+"?realm=gatein&goto="+httpRequest.getRequestURL()+"?"+parameters);
+ return;
+ }
+ else
+ {
+ //clear the LOGOUT flag
+ httpRequest.getSession().removeAttribute("SSO_LOGOUT_FLAG");
+ }
+ }
+
+ chain.doFilter(request, response);
+ }
+
+ private boolean isLogoutInProgress(HttpServletRequest request)
+ {
+ String action = request.getParameter("portal:action");
+
+ if(action != null && action.equals("Logout"))
+ {
+ return true;
+ }
+
+ return false;
+ }
+}
14 years, 9 months
gatein SVN: r2473 - portal/trunk/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet.
by do-not-reply＠jboss.org
Author: thuy.nguyen
Date: 2010-04-05 05:53:23 -0400 (Mon, 05 Apr 2010)
New Revision: 2473
Modified:
portal/trunk/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css
Log:
GTNPORTAL-912: Display issue in Application Registry > Portlets when portlet application name is too long
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css 2010-04-05 09:45:42 UTC (rev 2472)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css 2010-04-05 09:53:23 UTC (rev 2473)
@@ -429,7 +429,9 @@
background: #b7b7b7 url(DefaultSkin/background/ControlIcon.gif) no-repeat scroll 5px -196px; /* orientation=lt */
background: #b7b7b7 url(DefaultSkin/background/ControlIcon-rt.gif) no-repeat scroll right -196px; /* orientation=rt */
color: white;
- font-weight: bold;
+ font-weight: bold;
+ white-space: nowrap;
+ overflow: hidden;
}
.UIPortletManagement .ListCategory .ListItem {
14 years, 9 months
gatein SVN: r2472 - in portal/trunk: portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet and 2 other directories.
by do-not-reply＠jboss.org
Author: thuy.nguyen
Date: 2010-04-05 05:45:42 -0400 (Mon, 05 Apr 2010)
New Revision: 2472
Modified:
portal/trunk/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css
portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/DefaultStylesheet.css
portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/Stylesheet.css
portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIGadget/Stylesheet.css
Log:
GTNPORTAL-812: Cursor pointer over links has no pointer icon and vice versa
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css 2010-04-04 20:02:57 UTC (rev 2471)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css 2010-04-05 09:45:42 UTC (rev 2472)
@@ -267,7 +267,8 @@
.UIApplicationRegistryPortlet .UIVerticalSlideTabs .UIVTabContent .ControlIcon {
float: right; /* orientation=lt */
- float: left; /* orientation=rt */
+ float: left; /* orientation=rt */
+ cursor: pointer;
}
/**************************** AppWorkingArea *****************************/
@@ -310,7 +311,8 @@
.UIApplicationRegistryPortlet .UIBreadcumb .ControlIcon {
float: right; /* orientation=lt */
float: left; /* orientation=rt */
- margin: 0px 5px;
+ margin: 0px 5px;
+ cursor: pointer;
}
.UIApplicationRegistryPortlet .ApplicationContainer {
Modified: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/DefaultStylesheet.css
===================================================================
--- portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/DefaultStylesheet.css 2010-04-04 20:02:57 UTC (rev 2471)
+++ portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/DefaultStylesheet.css 2010-04-05 09:45:42 UTC (rev 2472)
@@ -154,7 +154,7 @@
padding-left: 16px; /* orientation=rt */
background: url('DefaultSkin/background/NavDownArrow.gif') no-repeat right; /* orientation=lt */
background: url('DefaultSkin/background/NavDownArrow.gif') no-repeat left; /* orientation=rt */
- cursor: pointer;
+ cursor: default;
}
/*###############-Selected Navigation Tab-################*/
@@ -208,7 +208,7 @@
border: solid #b7b7b7 1px; /*fix for IE*/
text-align: left; /* orientation=lt */
text-align: right; /* orientation=rt */
- z-index: 1;
+ z-index: 1;
}
.UINavigationPortlet .MenuItemContainer .MenuItemDecorator {
Modified: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/Stylesheet.css
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/Stylesheet.css 2010-04-04 20:02:57 UTC (rev 2471)
+++ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/Stylesheet.css 2010-04-05 09:45:42 UTC (rev 2472)
@@ -330,6 +330,7 @@
padding: 0 9px;
border: 1px solid #dbdbdb;
border-top: none;
+ cursor: move;
}
.UIDashboard .UIGadget .GadgetControl .GadgetDragHandleArea {
Modified: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIGadget/Stylesheet.css
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIGadget/Stylesheet.css 2010-04-04 20:02:57 UTC (rev 2471)
+++ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIGadget/Stylesheet.css 2010-04-05 09:45:42 UTC (rev 2472)
@@ -169,6 +169,10 @@
margin-left: 101px;
}
+.UIGadgetContent .gadgets-gadget-user-prefs-dialog-action-bar input {
+ cursor: pointer;
+}
+
.UIGadgetContent .devToolbar {
width: 56%;
}
14 years, 9 months
gatein SVN: r2471 - components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter.
by do-not-reply＠jboss.org
Author: sohil.shah(a)jboss.com
Date: 2010-04-04 16:02:57 -0400 (Sun, 04 Apr 2010)
New Revision: 2471
Added:
components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/JOSSOLogoutFilter.java
Log:
Adding support for JOSSO Logout
Added: components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/JOSSOLogoutFilter.java
===================================================================
--- components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/JOSSOLogoutFilter.java (rev 0)
+++ components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/JOSSOLogoutFilter.java 2010-04-04 20:02:57 UTC (rev 2471)
@@ -0,0 +1,118 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.gatein.sso.agent.filter;
+
+import java.io.IOException;
+import java.net.URLEncoder;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+//Works for GateIn Portal Logout URL = {AnyURL}?portal:componentId=UIPortal&portal:action=Logout
+
+/**
+ * Usage:
+ *
+ * Add the following to portal.war/WEB-INF/web.xml
+ *
+ * <filter>
+ * <filter-name>JOSSOLogoutFilter</filter-name>
+ * <filter-class>org.gatein.sso.agent.filter.SSOLogoutFilter</filter-class>
+ * <init-param>
+ * <!-- This should point to your JOSSO authentication server -->
+ * <param-name>JOSSO_LOGOUT_URL</param-name>
+ * <param-value>http://localhost:8888/josso/signon/logout.do</param-value>
+ * </init-param>
+ * </filter>
+ *
+ * <filter-mapping>
+ * <filter-name>JOSSOLogoutFilter</filter-name>
+ * <url-pattern>/*</url-pattern>
+ * </filter-mapping>
+ *
+ *
+ *
+ */
+
+
+/**
+ * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
+ */
+public class JOSSOLogoutFilter implements Filter
+{
+ private String jossoLogoutUrl;
+
+ public void init(FilterConfig config) throws ServletException
+ {
+ this.jossoLogoutUrl = config.getInitParameter("JOSSO_LOGOUT_URL");
+ }
+
+ public void destroy()
+ {
+ }
+
+ public void doFilter(ServletRequest request, ServletResponse response,
+ FilterChain chain) throws IOException, ServletException
+ {
+ HttpServletRequest httpRequest = (HttpServletRequest)request;
+ HttpServletResponse httpResponse = (HttpServletResponse)response;
+
+ boolean isLogoutInProgress = this.isLogoutInProgress(httpRequest);
+
+ if(isLogoutInProgress)
+ {
+
+ if(httpRequest.getSession().getAttribute("SSO_LOGOUT_FLAG") == null)
+ {
+ httpRequest.getSession().setAttribute("SSO_LOGOUT_FLAG", Boolean.TRUE);
+ String parameters = URLEncoder.encode("portal:componentId=UIPortal&portal:action=Logout", "UTF-8");
+ httpResponse.sendRedirect(jossoLogoutUrl+"?josso_back_to="+httpRequest.getRequestURL()+"?"+parameters);
+ return;
+ }
+ else
+ {
+ //clear the LOGOUT flag
+ httpRequest.getSession().removeAttribute("SSO_LOGOUT_FLAG");
+ }
+ }
+
+ chain.doFilter(request, response);
+ }
+
+ private boolean isLogoutInProgress(HttpServletRequest request)
+ {
+ String action = request.getParameter("portal:action");
+
+ if(action != null && action.equals("Logout"))
+ {
+ return true;
+ }
+
+ return false;
+ }
+}
14 years, 9 months
gatein SVN: r2470 - in components/sso/trunk: agent/src/main/java/org/gatein/sso/agent/filter and 2 other directories.
by do-not-reply＠jboss.org
Author: sohil.shah(a)jboss.com
Date: 2010-04-03 10:31:40 -0400 (Sat, 03 Apr 2010)
New Revision: 2470
Added:
components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/
components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/SPNEGOTxFilter.java
Modified:
components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/login/SPNEGORolesModule.java
components/sso/trunk/spnego/
components/sso/trunk/spnego/pom.xml
Log:
spnego logout fix
Added: components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/SPNEGOTxFilter.java
===================================================================
--- components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/SPNEGOTxFilter.java (rev 0)
+++ components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/SPNEGOTxFilter.java 2010-04-03 14:31:40 UTC (rev 2470)
@@ -0,0 +1,145 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.gatein.sso.agent.filter;
+
+import java.io.IOException;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+
+import javax.transaction.TransactionManager;
+import javax.transaction.Status;
+import javax.naming.InitialContext;
+
+import org.exoplatform.container.web.AbstractFilter;
+import org.exoplatform.services.organization.OrganizationService;
+import org.exoplatform.services.organization.User;
+
+/**
+ * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
+ */
+public class SPNEGOTxFilter extends AbstractFilter
+{
+
+ public void destroy()
+ {
+ }
+
+ public void doFilter(ServletRequest request, ServletResponse response,
+ FilterChain chain) throws IOException, ServletException
+ {
+ HttpServletRequest httpRequest = (HttpServletRequest)request;
+
+ boolean isStartedHere = this.startTx();
+ try
+ {
+ String remoteUser = httpRequest.getRemoteUser();
+
+ System.out.println("-----------------------------------------------------------------");
+ System.out.println("SPNEGO TX Filter invoked...(TX Started: )"+isStartedHere);
+ System.out.println("RequestURL: "+httpRequest.getRequestURI());
+ System.out.println("RemoteUser: "+remoteUser);
+
+ if(remoteUser != null)
+ {
+ OrganizationService orgService =
+ (OrganizationService)getContainer().getComponentInstanceOfType(OrganizationService.class);
+ User user = orgService.getUserHandler().findUserByName(remoteUser);
+
+ System.out.println("Exo User: "+user);
+ }
+ System.out.println("-----------------------------------------------------------------");
+
+ chain.doFilter(request, response);
+
+ if(isStartedHere)
+ {
+ this.commit();
+ }
+ }
+ catch(Throwable t)
+ {
+ t.printStackTrace();
+
+ if(isStartedHere)
+ {
+ this.rollback();
+ }
+
+ throw new RuntimeException(t);
+ }
+ }
+
+ private boolean startTx()
+ {
+ try
+ {
+ TransactionManager tm = (TransactionManager)new InitialContext().lookup("java:/TransactionManager");
+
+ if(tm.getStatus() == Status.STATUS_NO_TRANSACTION)
+ {
+ tm.begin();
+ return true;
+ }
+
+ return false;
+ }
+ catch(Throwable t)
+ {
+ t.printStackTrace();
+ return false;
+ }
+ }
+
+ private void commit()
+ {
+ try
+ {
+ TransactionManager tm = (TransactionManager)new InitialContext().lookup("java:/TransactionManager");
+ tm.commit();
+ }
+ catch(Throwable t)
+ {
+ t.printStackTrace();
+ throw new RuntimeException(t);
+ }
+ }
+
+ private void rollback()
+ {
+ try
+ {
+ TransactionManager tm = (TransactionManager)new InitialContext().lookup("java:/TransactionManager");
+ tm.rollback();
+ }
+ catch(Throwable t)
+ {
+ t.printStackTrace();
+ throw new RuntimeException(t);
+ }
+ }
+}
Modified: components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/login/SPNEGORolesModule.java
===================================================================
--- components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/login/SPNEGORolesModule.java 2010-04-02 17:37:38 UTC (rev 2469)
+++ components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/login/SPNEGORolesModule.java 2010-04-03 14:31:40 UTC (rev 2470)
@@ -24,8 +24,14 @@
import java.security.Principal;
import java.security.acl.Group;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
import java.util.Map;
+import java.util.Set;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
import javax.security.auth.Subject;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.login.LoginException;
@@ -40,13 +46,13 @@
import org.exoplatform.services.security.Identity;
import org.exoplatform.services.security.Authenticator;
import org.exoplatform.services.security.IdentityRegistry;
+import org.exoplatform.container.monitor.jvm.J2EEServerInfo;
+import org.exoplatform.services.security.jaas.UserPrincipal;
/**
- * Login module to work in conjunction with SPNEGOAuthenticator to handle the
- * authentication requirements.
+ * The LoginModule that is responsible for setting up the proper GateIn roles corresponding to the SPNEGO principal that was authenticated
*
- * @author darran.lofthouse(a)jboss.com
- * @version $Revision: 83572 $
+ * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
*/
public class SPNEGORolesModule extends AbstractServerLoginModule
{
@@ -171,7 +177,7 @@
IdentityRegistry identityRegistry = (IdentityRegistry) getContainer()
.getComponentInstanceOfType(IdentityRegistry.class);
- // TODO: Add check for single check
+ // Check for single check
if(identityRegistry.getIdentity(this.identity.getUserId()) != null)
{
//already logged in
@@ -193,4 +199,87 @@
throw new LoginException(e.getMessage());
}
}
+
+ @Override
+ public boolean logout() throws LoginException
+ {
+ org.exoplatform.container.monitor.jvm.J2EEServerInfo info = new J2EEServerInfo();
+ MBeanServer jbossServer = info.getMBeanServer();
+
+ //
+ if (jbossServer != null)
+ {
+ try
+ {
+
+ log.debug("Performing JBoss security manager cache eviction");
+
+ ObjectName securityManagerName = new ObjectName("jboss.security:service=JaasSecurityManager");
+
+ // Obtain user name
+ String userName = null;
+ Set<UserPrincipal> userPrincipals = subject.getPrincipals(UserPrincipal.class);
+ if (!userPrincipals.isEmpty())
+ {
+ // There should be one
+ userName = userPrincipals.iterator().next().getName();
+ }
+
+ //
+ if (userName != null)
+ {
+ log.debug("Going to perform JBoss security manager cache eviction for user " + userName);
+
+ //
+ List allPrincipals =
+ (List)jbossServer.invoke(securityManagerName, "getAuthenticationCachePrincipals",
+ new Object[]{realmName}, new String[]{String.class.getName()});
+
+ // Make a copy to avoid some concurrent mods
+ allPrincipals = new ArrayList(allPrincipals);
+
+ // Lookup for invalidation key, it must be the same principal!
+ Principal key = null;
+ for (Iterator i = allPrincipals.iterator(); i.hasNext();)
+ {
+ Principal principal = (Principal)i.next();
+ if (principal.getName().equals(userName))
+ {
+ key = principal;
+ break;
+ }
+ }
+
+ // Perform invalidation
+ if (key != null)
+ {
+ jbossServer.invoke(securityManagerName, "flushAuthenticationCache", new Object[]{realmName, key},
+ new String[]{String.class.getName(), Principal.class.getName()});
+ log.debug("Performed JBoss security manager cache eviction for user " + userName + " with principal "
+ + key);
+ }
+ else
+ {
+ log.warn("No principal found when performing JBoss security manager cache eviction for user "
+ + userName);
+ }
+ }
+ else
+ {
+ log.warn("No user name found when performing JBoss security manager cache eviction");
+ }
+ }
+ catch (Exception e)
+ {
+ log.error("Could not perform JBoss security manager cache eviction", e);
+ }
+ }
+ else
+ {
+ log.debug("Could not find mbean server for performing JBoss security manager cache eviction");
+ }
+
+ //
+ return true;
+ }
}
Property changes on: components/sso/trunk/spnego
___________________________________________________________________
Name: svn:ignore
+ target
Modified: components/sso/trunk/spnego/pom.xml
===================================================================
--- components/sso/trunk/spnego/pom.xml 2010-04-02 17:37:38 UTC (rev 2469)
+++ components/sso/trunk/spnego/pom.xml 2010-04-03 14:31:40 UTC (rev 2470)
@@ -72,7 +72,7 @@
<copy
file="${settings.localRepository}/org/gatein/sso/spnego/${project.version}/${project.artifactId}-${project.version}.jar"
- todir="${gatein.location}/lib" overwrite="true" />
+ todir="${gatein.location}/deploy/gatein.ear/lib" overwrite="true" />
</tasks>
</configuration>
<goals>
14 years, 9 months
gatein SVN: r2469 - portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-04-02 13:37:38 -0400 (Fri, 02 Apr 2010)
New Revision: 2469
Modified:
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/JCRConsumerRegistry.java
Log:
- GTNWSRP-17: Fixed implementation of update that wasn't respecting the method contract (return the old id if it had changed).
Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/JCRConsumerRegistry.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/JCRConsumerRegistry.java 2010-04-02 13:00:21 UTC (rev 2468)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/JCRConsumerRegistry.java 2010-04-02 17:37:38 UTC (rev 2469)
@@ -111,11 +111,14 @@
{
throw new IllegalArgumentException("Couldn't find ProducerInfoMapping associated with key " + key);
}
+ String oldId = pim.getId();
+ String newId = producerInfo.getId();
pim.initFrom(producerInfo);
persister.closeSession(session, true);
- return null;
+ // if the consumer's id has changed, return the old one so that state can be updated
+ return (oldId.equals(newId)) ? null : oldId;
}
@Override
14 years, 9 months