Author: thomas.heute(a)jboss.com Date: 2007-05-10 11:04:30 -0400 (Thu, 10 May 2007) New Revision: 7238 Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml trunk/theme/src/main/org/jboss/portal/theme/LayoutService.java trunk/theme/src/main/org/jboss/portal/theme/impl/LayoutServiceImpl.java Log: Define a default renderSet. Modified: trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml =================================================================== --- trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-05-10 15:02:01 UTC (rev 7237) +++ trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-05-10 15:04:30 UTC (rev 7238) @@ -394,6 +394,7 @@ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> <attribute name="DefaultLayoutName">generic</attribute> + <attribute name="DefaultRenderSetName">divRenderer</attribute> </mbean> <mbean code="org.jboss.portal.theme.impl.PageServiceImpl" Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java 2007-05-10 15:02:01 UTC (rev 7237) +++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java 2007-05-10 15:04:30 UTC (rev 7238) @@ -438,7 +438,7 @@ { // Get the layout String layoutId = page.getProperty(ThemeConstants.PORTAL_PROP_LAYOUT); - PortalLayout layout = layoutService.getLayout(layoutId, false); + PortalLayout layout = layoutService.getLayout(layoutId, true); // LinkedHashMap windows = new LinkedHashMap(); Modified: trunk/theme/src/main/org/jboss/portal/theme/LayoutService.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/LayoutService.java 2007-05-10 15:02:01 UTC (rev 7237) +++ trunk/theme/src/main/org/jboss/portal/theme/LayoutService.java 2007-05-10 15:04:30 UTC (rev 7238) @@ -58,6 +58,10 @@ /** Register a renderSet with this service */ void addRenderSet(RuntimeContext runtimeContext, RenderSetMetaData renderSet) throws LayoutException; + public void setDefaultRenderSetName(String name); + + public String getDefaultRenderSetName(); + /** * Remove all rendersets that are hosted in the provided application. * Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/LayoutServiceImpl.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/LayoutServiceImpl.java 2007-05-10 15:02:01 UTC (rev 7237) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/LayoutServiceImpl.java 2007-05-10 15:04:30 UTC (rev 7238) @@ -87,6 +87,8 @@ /** . */ private String defaultName; + private String defaultRenderSetName; + public LayoutServiceImpl() { log.debug("LayoutServiceImpl instantiated."); @@ -161,7 +163,7 @@ } } - public void setDefaultLayoutName(String name) throws LayoutException + public void setDefaultLayoutName(String name) { log.debug("setting default: " + name); defaultName = name; @@ -449,6 +451,17 @@ return Collections.unmodifiableCollection((renderSetNames.values())); } + public void setDefaultRenderSetName(String name) + { + log.debug("setting default render set: " + name); + defaultRenderSetName = name; + } + + public String getDefaultRenderSetName() + { + return defaultRenderSetName; + } + /** * Get the PortalRenderSet to use for the provided layout, page and media type. <p>The render set can be defined * specifically for a layout, a page, or a portal. The one defined for the layout overwrites the one defined for the @@ -457,6 +470,10 @@ */ public PortalRenderSet getRenderSet(LayoutInfo info, ContentInfo streamInfo, String renderSetName) { + if (renderSetName == null) + { + renderSetName = getDefaultRenderSetName(); + } if (info == null || renderSetName == null || streamInfo == null) { throw new IllegalArgumentException("No null arguments allowed [" + info + "] [" + renderSetName + "] [" + streamInfo + "]");