You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2006/05/31 20:21:23 UTC
svn commit: r410629 - in
/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed:
decoration/DecorationValve.java login/LoginProxyServlet.java
Author: taylor
Date: Wed May 31 11:21:23 2006
New Revision: 410629
URL: http://svn.apache.org/viewvc?rev=410629&view=rev
Log:
http://issues.apache.org/jira/browse/JS2-532
by Philip Mark Donaghy
Overriding themes declared in psml
Modified:
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/decoration/DecorationValve.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/login/LoginProxyServlet.java
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/decoration/DecorationValve.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/decoration/DecorationValve.java?rev=410629&r1=410628&r2=410629&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/decoration/DecorationValve.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/decoration/DecorationValve.java Wed May 31 11:21:23 2006
@@ -87,6 +87,16 @@
decorationFactory.clearCache(requestContext);
}
ContentPage page = requestContext.getPage();
+
+ // Globaly override all psml themes if override session attribute has been set
+ if (requestContext
+ .getSessionAttribute(PortalReservedParameters.PAGE_THEME_OVERRIDE_ATTRIBUTE) != null)
+ {
+ String decoratorName = (String) requestContext
+ .getSessionAttribute(PortalReservedParameters.PAGE_THEME_OVERRIDE_ATTRIBUTE);
+ page.setDefaultDecorator(decoratorName, Fragment.LAYOUT);
+ }
+
Theme theme = decorationFactory.getTheme(page, requestContext);
requestContext.setAttribute(PortalReservedParameters.PAGE_THEME_ATTRIBUTE, theme);
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/login/LoginProxyServlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/login/LoginProxyServlet.java?rev=410629&r1=410628&r2=410629&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/login/LoginProxyServlet.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/login/LoginProxyServlet.java Wed May 31 11:21:23 2006
@@ -23,6 +23,8 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
+import org.apache.jetspeed.PortalReservedParameters;
+
/**
* LoginProxyServlet
*
@@ -54,6 +56,17 @@
session.setAttribute(LoginConstants.PASSWORD, parameter);
else
session.removeAttribute(LoginConstants.PASSWORD);
+
+ // Globaly override all psml themes
+ if (request
+ .getParameter(PortalReservedParameters.PAGE_THEME_OVERRIDE_ATTRIBUTE) != null)
+ {
+ String decoratorName = request
+ .getParameter(PortalReservedParameters.PAGE_THEME_OVERRIDE_ATTRIBUTE);
+ session.setAttribute(
+ PortalReservedParameters.PAGE_THEME_OVERRIDE_ATTRIBUTE,
+ decoratorName);
+ }
response.sendRedirect(response.encodeURL(request.getContextPath()
+ "/login/redirector"));
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org