[jboss-svn-commits] JBL Code SVN: r6054 - in labs/jbosslabs/trunk/portal-extensions: forge-theme forge-theme/jbossForgeLayout.war/WEB-INF forge-theme/src/java/org/jboss/portal/core/theme/render/impl portal-default/src/web/WEB-INF
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Aug 31 17:55:07 EDT 2006
Author: szimano
Date: 2006-08-31 17:55:05 -0400 (Thu, 31 Aug 2006)
New Revision: 6054
Removed:
labs/jbosslabs/trunk/portal-extensions/forge-theme/jbossForgeLayout.war/WEB-INF/layout/
labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFDecorationRenderer.java
labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFPortletRenderer.java
labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFRegionRenderer.java
labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFStrategyImpl.java
labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFWindowRenderer.java
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-theme/maven.xml
labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
Log:
using emptyRenderer, removed unneeded jbfRenderer, added theme to default-object
Modified: labs/jbosslabs/trunk/portal-extensions/forge-theme/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-theme/maven.xml 2006-08-31 21:42:45 UTC (rev 6053)
+++ labs/jbosslabs/trunk/portal-extensions/forge-theme/maven.xml 2006-08-31 21:55:05 UTC (rev 6054)
@@ -17,20 +17,20 @@
</goal>
<goal name="build">
- <!--<attainGoal name="jar" />
+ <attainGoal name="jar" />
<ant:copy todir="jbossForgeLayout.war/WEB-INF/lib" overwrite="true">
<ant:fileset dir="target">
<ant:include name="*.jar" />
</ant:fileset>
- </ant:copy>-->
+ </ant:copy>
</goal>
<goal name="deploy">
-<!-- <ant:copy todir="${local.deploy.dir}" overwrite="true">
+ <ant:copy todir="${local.deploy.dir}" overwrite="true">
<ant:fileset dir=".">
<ant:include name="jbossForgeLayout.war/**" />
</ant:fileset>
- </ant:copy>-->
+ </ant:copy>
</goal>
</project>
Deleted: labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFDecorationRenderer.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFDecorationRenderer.java 2006-08-31 21:42:45 UTC (rev 6053)
+++ labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFDecorationRenderer.java 2006-08-31 21:55:05 UTC (rev 6054)
@@ -1,96 +0,0 @@
-/*****************************************
- * *
- * JBoss Portal: The OpenSource Portal *
- * *
- * Distributable under LGPL license. *
- * See terms of license at gnu.org. *
- * *
- *****************************************/
-
-package org.jboss.portal.core.theme.render.impl;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.jboss.logging.Logger;
-import org.jboss.portal.theme.ThemeException;
-import org.jboss.portal.theme.page.WindowResult;
-import org.jboss.portal.theme.page.WindowContext;
-import org.jboss.portal.theme.render.DecorationRenderer;
-import org.jboss.portal.theme.render.RenderContext;
-import org.jboss.portal.theme.render.RenderException;
-
-import javax.portlet.PortletContext;
-
-/**
- * @author <a href="mailto:tomasz.szymanski at jboss.com">Tomasz Szymanski</a>
- *
- */
-public class JBFDecorationRenderer implements DecorationRenderer {
-
- private static final Object SHOW_DECORATION_PORPERTY = "decorationVisible";
-
- private static Logger log = Logger.getLogger(JBFDecorationRenderer.class);
-
- /**
- * @see org.jboss.portal.theme.render.Renderer#renderStart
- */
- public void renderStart(RenderContext ctx) {
- }
-
- /**
- * @see org.jboss.portal.theme.render.Renderer#renderEnd
- */
- public void renderEnd(RenderContext ctx) {
- }
-
- public void render(RenderContext renderContext, WindowContext windowContext,
- WindowResult result) throws RenderException {
-
- if (result.getWindowProperties().get(SHOW_DECORATION_PORPERTY) != null
- && result.getWindowProperties().get(
- SHOW_DECORATION_PORPERTY).equals("true")) {
- log.debug("decorate " + result.getTitle());
-
- //StringBuffer markup = renderContext.getMarkupFragment();
- //markup.append("<tr><td class=\"portlet-titlebar-left\"></td>");
- //markup.append("<td class=\"portlet-titlebar-center\">");
- // renderTitle(renderContext, result);
- //markup.append("<div class=\"portlet-mode-container\">");
- renderModeAndStateLinks(renderContext, result, "mode", windowContext);
- renderModeAndStateLinks(renderContext, result, "windowstate", windowContext);
-
- //markup
- // .append("</div></td><td class=\"portlet-titlebar-right\"></td></tr>");
-
- log.debug("decoration is done");
- }
- }
-
- private static void renderTitle(RenderContext ctx, WindowResult result) {
- ctx.getMarkupFragment().append(
- "<div class=\"portlet-titlebar-decoration\">");
- ctx.getMarkupFragment().append(
- "<span class=\"portlet-titlebar-title\">");
- ctx.getMarkupFragment().append(result.getTitle());
- ctx.getMarkupFragment().append("</span></div>");
- }
-
- private static void renderModeAndStateLinks(RenderContext ctx,
- WindowResult result, String selector, WindowContext portletContext) {
- log.debug("render modes and states");
- Collection modes = result.getTriggerableActions(selector);
- for (Iterator i = modes.iterator(); i.hasNext();) {
- WindowResult.Action action = (WindowResult.Action) i.next();
-
- if (action.isEnabled()) {
- log.debug("action is enabled: " + action.getName());
- ctx.getMarkupFragment().append("<a class=\"portlet-mode-")
- .append(action.getName());
- ctx.getMarkupFragment().append("\" href=\"")
- .append(action.getURL()).append("\">").append(
- action.getName()).append("</a> ");
- }
- }
- }
-}
Deleted: labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFPortletRenderer.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFPortletRenderer.java 2006-08-31 21:42:45 UTC (rev 6053)
+++ labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFPortletRenderer.java 2006-08-31 21:55:05 UTC (rev 6054)
@@ -1,54 +0,0 @@
-/*****************************************
- * *
- * JBoss Portal: The OpenSource Portal *
- * *
- * Distributable under LGPL license. *
- * See terms of license at gnu.org. *
- * *
- *****************************************/
-
-package org.jboss.portal.core.theme.render.impl;
-
-import org.jboss.portal.theme.page.WindowResult;
-import org.jboss.portal.theme.page.WindowContext;
-import org.jboss.portal.theme.render.PortletRenderer;
-import org.jboss.portal.theme.render.RenderContext;
-import org.jboss.portal.theme.render.RenderException;
-
-import javax.portlet.PortletContext;
-
-/**
- * @author <a href="mailto:tomasz.szymanski at jboss.com">Tomasz Szymanski</a>
- *
- */
-public class JBFPortletRenderer
- implements PortletRenderer
-{
-
- /**
- * @see PortletRenderer#render
- */
- public void render(RenderContext renderContext, WindowContext windowContext,
- WindowResult result) throws RenderException {
- renderStart(renderContext);
- renderContext.getMarkupFragment().append(result.getContent());
- renderEnd(renderContext);
- }
-
- /**
- * @see org.jboss.portal.theme.render.Renderer#renderStart
- */
- public void renderStart(RenderContext ctx)
- {
- ctx.getMarkupFragment().append("<tr><td class=\"portlet-content-left\"></td>");
- ctx.getMarkupFragment().append("<td class=\"portlet-body\"><div class=\"portlet-content-center\">");
- }
-
- /**
- * @see org.jboss.portal.theme.render.Renderer#renderEnd
- */
- public void renderEnd(RenderContext ctx)
- {
- ctx.getMarkupFragment().append("</div></td><td class=\"portlet-content-right\"></td></tr>");
- }
-}
Deleted: labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFRegionRenderer.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFRegionRenderer.java 2006-08-31 21:42:45 UTC (rev 6053)
+++ labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFRegionRenderer.java 2006-08-31 21:55:05 UTC (rev 6054)
@@ -1,80 +0,0 @@
-/*****************************************
- * *
- * JBoss Portal: The OpenSource Portal *
- * *
- * Distributable under LGPL license. *
- * See terms of license at gnu.org. *
- * *
- *****************************************/
-
-package org.jboss.portal.core.theme.render.impl;
-
-import java.util.Iterator;
-import java.util.Map;
-
-import org.jboss.portal.theme.page.Region;
-import org.jboss.portal.theme.page.WindowContext;
-import org.jboss.portal.theme.page.WindowResult;
-import org.jboss.portal.theme.render.RegionRenderer;
-import org.jboss.portal.theme.render.RenderContext;
-import org.jboss.portal.theme.render.RenderException;
-
-import javax.portlet.PortletContext;
-
-/**
- * @author <a href="mailto:tomasz.szymanski at jboss.com">Tomasz Szymanski</a>
- *
- */
-public class JBFRegionRenderer
- implements RegionRenderer
-{
- /**
- * @see RegionRenderer#render
- */
- public void render(RenderContext renderContext, Region region, Map portletContexts, Map windowResults) throws RenderException
- {
- StringBuffer markup = renderContext.getMarkupFragment();
- markup.append("<div");
-
- if (region == null || region.getWindows().size() <=0){
- markup.append(" class='empty-region' />");
- return;
- }else{
- if (renderContext.getRegionID() != null){
- markup.append(" id='").append(renderContext.getRegionID()).append("'>");
- }
- else {
- markup.append(">");
- }
- }
-
- for (Iterator i = region.getWindows().iterator(); i.hasNext();)
- {
- WindowContext windowContext = (WindowContext)i.next();
- WindowResult result = (WindowResult) windowResults.get(windowContext.getId());
-
- // The result may be null if it has not been added to the page for some reason
- if (result != null)
- {
- renderContext.getWindowRenderer(result).render(renderContext, windowContext, result);
- }
- }
-
- markup.append("</div>");
- }
-
- /**
- * @see org.jboss.portal.theme.render.Renderer#renderStart(org.jboss.portal.theme.render.RenderContext)
- */
- public void renderStart(RenderContext ctx)
- {
- }
-
- /**
- * @see org.jboss.portal.theme.render.Renderer#renderEnd(org.jboss.portal.theme.render.RenderContext)
- */
- public void renderEnd(RenderContext ctx)
- {
- }
-
-}
Deleted: labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFStrategyImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFStrategyImpl.java 2006-08-31 21:42:45 UTC (rev 6053)
+++ labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFStrategyImpl.java 2006-08-31 21:55:05 UTC (rev 6054)
@@ -1,174 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., 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.jboss.portal.core.theme.render.impl;
-
-import org.apache.log4j.Logger;
-import org.jboss.portal.WindowState;
-import org.jboss.portal.common.MediaType;
-import org.jboss.portal.theme.ThemeException;
-import org.jboss.portal.theme.page.PortletContext;
-import org.jboss.portal.theme.strategy.AbstractLayoutStrategy;
-import org.jboss.portal.theme.strategy.StrategyContext;
-import org.jboss.portal.theme.strategy.StrategyException;
-import org.jboss.portal.theme.strategy.StrategyResponse;
-
-import javax.portlet.PortletContext;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-/*
- *
- * @author <a href="mailto:mholzner at novell.com">Martin Holzner</a>
- * @version $Revision: 1.2.4.1 $
-*/
-public class JBFStrategyImpl extends AbstractLayoutStrategy
-{
- private static Logger log = Logger.getLogger(JBFStrategyImpl.class);
-
- public JBFStrategyImpl()
- {
- setMediaType(MediaType.HTML);
- }
-
- /**
- * Evaluate the strategy and return a strategy response, containing the desired changes.
- *
- * @param context a context containing the portal's current information about portlets, states and the layout
- * @return a strategy response with the desired changes
- * @throws org.jboss.portal.theme.strategy.StrategyException
- * if the strategy is missconfigured, or can't deal with the provided information
- */
- public StrategyResponse evaluate(StrategyContext context) throws StrategyException
- {
- if (context == null)
- {
- throw new NullPointerException("strategy context is null");
- }
-
- if (context.getLayout() == null)
- {
- throw new IllegalArgumentException("Strategy can only be evaluated with a valid layout provided.");
- }
-
- log.debug("evaluating strategy for: " + context.getLayout().getName());
-
- StrategyResponse response = context.createResponse();
-
- ArrayList maximizedPortlets = new ArrayList();
-
- // get the list of portlets and their window state, and check if one of the
- // portlets is maximized
- for (Iterator i = context.getPortletContexts().iterator(); i.hasNext();)
- {
- PortletContext portlet = (PortletContext)i.next();
- log.debug("evaluating portlet: " + portlet.getWindowID());
- try
- {
- if (WindowState.MAXIMIZED.equals(portlet.getWindowState()))
- {
- log.debug("found maximized portlet: " + portlet);
- maximizedPortlets.add(portlet);
- }
- else
- {
- // exclude all, but the maximized portlet, from the render process
-// response.addNoRender(portlet);
- // exclude all but the maximized portlet, and those in the left/right regions
- if ((!"left".equalsIgnoreCase(portlet.getRegionName())) &&
-(!"right".equalsIgnoreCase(portlet.getRegionName())) &&
-(!"innerleft".equalsIgnoreCase(portlet.getRegionName())) &&
-(!"innerright".equalsIgnoreCase(portlet.getRegionName())))
- {
- response.addNoRender(portlet);
- }
- }
- }
- catch (ThemeException e)
- {
- // window state not known
- log.warn(e);
- response.addNoRender(portlet);
- }
- }
- // if there is at least one portlet with maximized window state, then
- // switch the layout to the maximized layout, and
- // flag all portlets that are not part of the header region (except the maximized one) as 'do-not-render'
- // Note: it's better to flag them as do not render than to set their window states to minimized, since that
- // could be interpreted differently on the layout / theme
- // if one of the portlets is in maximized mode, then use the maximized layout
- if (maximizedPortlets.size() > 0)
- {
- PortletContext targetPortlet = context.getTargetPortlet();
- // there can only be one maximized portlet! when in doubt, the targeted portlet wins
- if (targetPortlet != null && maximizedPortlets.size() > 1)
- {
- try
- {
- if (maximizedPortlets.contains(targetPortlet) &&
- WindowState.MAXIMIZED.equals(targetPortlet.getWindowState()))
- {
- for (Iterator i = maximizedPortlets.iterator(); i.hasNext();)
- {
- PortletContext portlet = (PortletContext)i.next();
- if (!portlet.equals(targetPortlet))
- {
- log.debug("resetting maximized portlet to normal (there can only be one): " + portlet + " " +
- targetPortlet + " will be maximized");
- // change the window state back to normal, and make sure the
- // portlet is not rendered
- response.addWindowStateChange(portlet, WindowState.NORMAL);
- response.addNoRender(portlet);
- }
- else
- {
- // move the maximized portlet to the maximized region
- portlet.setRegionName(WindowState.MAXIMIZED.toString());
- }
- }
- }
- }
- catch (ThemeException e)
- {
- // the target portlet's state isn't known (portlet was deregistered?) , so exclude it
- response.addNoRender(targetPortlet);
- }
- }
- else
- {
- // move the maximized portlet to the maximized region
- //PortletContext portlet = (PortletContext)maximizedPortlets.get(0);
- //portlet.setRegionName(WindowState.MAXIMIZED.toString());
- }
-
- // set the layout state so that the interceptor can check if there is another uri specified in the layout for this state
- response.setLayoutState(WindowState.MAXIMIZED.toString());
- maximizedPortlets.clear();
- }
- else
- {
- // if there is no maximized portlet, then clean up (forget about the norender list)
- response.reset();
- }
-
- return response;
- }
-}
Deleted: labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFWindowRenderer.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFWindowRenderer.java 2006-08-31 21:42:45 UTC (rev 6053)
+++ labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFWindowRenderer.java 2006-08-31 21:55:05 UTC (rev 6054)
@@ -1,94 +0,0 @@
-/*****************************************
- * *
- * JBoss Portal: The OpenSource Portal *
- * *
- * Distributable under LGPL license. *
- * See terms of license at gnu.org. *
- * *
- *****************************************/
-
-package org.jboss.portal.core.theme.render.impl;
-
-import org.jboss.logging.Logger;
-import org.jboss.portal.WindowState;
-import org.jboss.portal.theme.ThemeException;
-import org.jboss.portal.theme.page.WindowResult;
-import org.jboss.portal.theme.page.WindowContext;
-import org.jboss.portal.theme.render.DecorationRenderer;
-import org.jboss.portal.theme.render.PortletRenderer;
-import org.jboss.portal.theme.render.RenderContext;
-import org.jboss.portal.theme.render.RenderException;
-import org.jboss.portal.theme.render.WindowRenderer;
-
-/**
- * @author <a href="mailto:tomasz.szymanski at jboss.com">Tomasz Szymanski</a>
- *
- */
-public class JBFWindowRenderer implements WindowRenderer {
-
- private Logger log = Logger.getLogger(this.getClass());
-
- /**
- * @see WindowRenderer#render
- */
- public void render(RenderContext renderContext,
- WindowContext windowContext, WindowResult result)
- throws RenderException {
- renderStart(renderContext);
-
- try {
- DecorationRenderer decorationRenderer = renderContext
- .getDecorationRenderer(result);
- if (decorationRenderer != null) {
- decorationRenderer
- .render(renderContext, windowContext, result);
- }
-
- WindowState windowState = windowContext.getWindowState();
- if (!WindowState.MINIMIZED.equals(windowState)) {
- PortletRenderer portletRenderer = renderContext
- .getPortletRenderer(result);
- if (portletRenderer != null) {
- portletRenderer.render(renderContext, windowContext,
- result);
- }
-
- renderContext.getMarkupFragment().append(
- "<tr><td class=\"portlet-footer-left\"></td>");
- renderContext.getMarkupFragment().append(
- "<td class=\"portlet-footer-center\"></td>");
- renderContext.getMarkupFragment().append(
- "<td class=\"portlet-footer-right\"></td></tr>");
- }
-
- } catch (ThemeException e) {
- // the portlet state is not known (the portlet registration is
- // gone), handle it
- log.error("", e);
- // +++TODO: the error message should be configurable ...?
- renderContext.getMarkupFragment().append(
- "<p class='portlet-error'><pre>").append(e).append(
- "</pre></p>");
- }
-
- renderEnd(renderContext);
- }
-
- /**
- * @see org.jboss.portal.theme.render.Renderer#renderStart(org.jboss.portal.theme.render.RenderContext)
- */
- public void renderStart(RenderContext ctx) {
- ctx.getMarkupFragment().append("<div class=\"portlet-container\">");
- ctx
- .getMarkupFragment()
- .append(
- "<table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">");
- }
-
- /**
- * @see org.jboss.portal.theme.render.Renderer#renderEnd(org.jboss.portal.theme.render.RenderContext)
- */
- public void renderEnd(RenderContext ctx) {
- ctx.getMarkupFragment().append("</table></div>");
- }
-}
Modified: labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml 2006-08-31 21:42:45 UTC (rev 6053)
+++ labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml 2006-08-31 21:55:05 UTC (rev 6054)
@@ -9,20 +9,17 @@
<!-- Set the layout for the default portal, see also portal-layouts.xml. -->
<property>
<name>layout.id</name>
- <!--<value>JBossForge</value>-->
- <value>generic</value>
+ <value>JBossForge</value>
</property>
<!-- Set the theme for the default portal, see also portal-themes.xml. -->
<property>
<name>theme.id</name>
- <!--<value>jboss-forge</value>-->
- <value>Nphalanx</value>
+ <value>jboss-forge</value>
</property>
<!-- Set the default render set name (used by the render tag in layouts), see also portal-renderSet.xml -->
<property>
<name>theme.renderSetId</name>
- <!--<value>jbfRenderer</value>-->
- <value>divRenderer</value>
+ <value>emptyRenderer</value>
</property>
<!-- Set the default strategy name (used by the strategy interceptor), see also portal-strategies.xml -->
<property>
More information about the jboss-svn-commits
mailing list