[jboss-svn-commits] JBoss Portal SVN: r5166 - trunk/core/src/main/org/jboss/portal/core/controller/command

[jboss-svn-commits at lists.jboss.org]

Author: roy.russo at jboss.com
Date: 2006-09-07 17:15:44 -0400 (Thu, 07 Sep 2006)
New Revision: 5166

Modified:
   trunk/core/src/main/org/jboss/portal/core/controller/command/MarkupCommand.java
Log:
- added theme and themeResult to request. This is needed as the ThemeTagHandler requires it.

Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/MarkupCommand.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/command/MarkupCommand.java	2006-09-07 21:07:16 UTC (rev 5165)
+++ trunk/core/src/main/org/jboss/portal/core/controller/command/MarkupCommand.java	2006-09-07 21:15:44 UTC (rev 5166)
@@ -323,21 +323,23 @@
             theme = getTheme(themeId);
          }
 
+         // Call the portlet container to create the markup fragment(s) for each portlet that needs to render itself
+         ServerConfig cfg = sinv.getRequest().getServer().getConfig();
+         MarkupResult renderResult = renderFragments(cfg, navCtx);
+
          // Make the theme available as servlet request attribute (needed for CM)
-         if (theme != null)
+         if(theme != null)
          {
             // render the theme markup and place it into the request so that the markup assembler (theme tag) can pick it up there
             ThemeResult themeResult = theme.assembleResponse(sinv.getRequest(), sinv.getResponse());
-            request.setAttribute(ThemeConstants.ATTR_THEMERESULT, themeResult);
-            request.setAttribute(ThemeConstants.ATTR_THEME, theme);
-         }
+//            request.setAttribute(ThemeConstants.ATTR_THEMERESULT, themeResult);
+//            request.setAttribute(ThemeConstants.ATTR_THEME, theme);
+            renderResult.setTheme(theme);
+            renderResult.setThemeResult(themeResult);
 
-         // Call the portlet container to create the markup fragment(s) for each portlet that needs to render itself
-         ServerConfig cfg = sinv.getRequest().getServer().getConfig();
-         MarkupResult renderResult = renderFragments(cfg, navCtx);
-
          //
          result = new PageRendition(layout, pageNavState, renderResult, pageService);
+         }
       }
       catch (Exception e)
       {