Author: julien(a)jboss.com
Date: 2007-04-06 10:30:52 -0400 (Fri, 06 Apr 2007)
New Revision: 6934
Added:
trunk/theme/src/bin/test/theme-test-war/themes/style.css
trunk/theme/src/main/org/jboss/portal/theme/impl/JSPRenderContext.java
trunk/theme/src/main/org/jboss/portal/theme/impl/WriterRenderContext.java
Removed:
trunk/theme/src/resources/test/theme-test-war/WEB-INF/layout/
trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-layouts.xml
trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-themes.xml
Modified:
trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java
trunk/theme/build.xml
trunk/theme/src/bin/test/theme-test-war/WEB-INF/portal-themes.xml
trunk/theme/src/main/org/jboss/portal/test/theme/TestServlet.java
trunk/theme/src/main/org/jboss/portal/theme/PortalLayout.java
trunk/theme/src/main/org/jboss/portal/theme/impl/JSPLayout.java
trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java
trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivPortletRenderer.java
trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivRegionRenderer.java
trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivWindowRenderer.java
trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java
trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java
trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java
trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaWindowRenderer.java
trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyPortletRenderer.java
trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyRegionRenderer.java
trunk/theme/src/main/org/jboss/portal/theme/render/RenderContext.java
trunk/theme/src/main/org/jboss/portal/theme/tag/HeaderContentTagHandler.java
trunk/theme/src/main/org/jboss/portal/theme/tag/RegionTagHandler.java
trunk/theme/src/main/org/jboss/portal/theme/tag/ThemeTagHandler.java
trunk/theme/src/resources/test/theme-test-sar/META-INF/jboss-service.xml
trunk/theme/src/resources/test/theme-test-war/WEB-INF/web.xml
Log:
- change the RenderContext#StringBuffer to a Writer
- make the difference between rendering a fragment and render the page using the response
provided by the http servlet response
Modified:
trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java 2007-04-05
22:19:51 UTC (rev 6933)
+++
trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java 2007-04-06
14:30:52 UTC (rev 6934)
@@ -67,6 +67,8 @@
import javax.servlet.ServletException;
import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
import java.util.Set;
import java.util.HashSet;
import java.util.Iterator;
@@ -297,19 +299,24 @@
//
MarkupInfo markupInfo =
(MarkupInfo)invocation.getResponse().getContentInfo();
- //
+ // The buffer
+ StringWriter buffer = new StringWriter();
+
+ // Get a dispatcher
ServletContextDispatcher dispatcher = new
ServletContextDispatcher(invocation.getServerContext().getClientRequest(),
invocation.getServerContext().getClientResponse(),
controllerContext.getController().getServletContainerContext());
- RenderContext renderContext = layout.getRenderContext(markupInfo,
dispatcher);
+ // get render context
+ RenderContext renderContext = layout.getRenderContext(markupInfo,
dispatcher, buffer);
+
// Should push region context as well
renderContext.setAttribute(DynaConstants.AJAX_WINDOW_ENABLED,
Boolean.TRUE);
renderContext.pushObjectRenderContext(res);
- //
+ // Render
renderContext.render(wc);
- //
- updatePage.addFragment(wc.getId(),
renderContext.getMarkupFragment().toString());
+ // Add render to the page
+ updatePage.addFragment(wc.getId(), buffer.toString());
}
}
catch (Exception e)
Modified: trunk/theme/build.xml
===================================================================
--- trunk/theme/build.xml 2007-04-05 22:19:51 UTC (rev 6933)
+++ trunk/theme/build.xml 2007-04-06 14:30:52 UTC (rev 6934)
@@ -238,16 +238,12 @@
<fileset dir="${jboss.portal-common.root}/lib"
includes="portal-common-lib.jar"/>
<fileset dir="${jboss.portal-server.root}/lib"
includes="portal-server-lib.jar"/>
<fileset dir="${jboss.portal-jems.root}/lib"
includes="portal-jems-lib.jar"/>
+ <fileset dir="${jboss.portal-web.root}/lib"
includes="portal-web-lib.jar"/>
<fileset dir="${jboss.portlet-api.root}/lib"
includes="portal-api-lib.jar"/>
<fileset dir="${jboss.portal-theme.root}/lib"
includes="portal-theme-lib.jar"/>
<fileset dir="${build.lib}"
includes="portal-theme-test-lib.jar"/>
</jar>
- <!-- easy deployment - for testing
- <require file="${jboss.home}/server/${portal.deploy.dir}"/>
- <delete
file="${jboss.home}/server/${portal.deploy.dir}/theme-test.sar"/>
- <copy file="${build.lib}/theme-test.sar"
todir="${jboss.home}/server/${portal.deploy.dir}"
overwrite="true"/>
- -->
</target>
<target name="jar-test" description="Generate the theme test
artifacts" depends="init">
Modified: trunk/theme/src/bin/test/theme-test-war/WEB-INF/portal-themes.xml
===================================================================
--- trunk/theme/src/bin/test/theme-test-war/WEB-INF/portal-themes.xml 2007-04-05 22:19:51
UTC (rev 6933)
+++ trunk/theme/src/bin/test/theme-test-war/WEB-INF/portal-themes.xml 2007-04-06 14:30:52
UTC (rev 6934)
@@ -24,6 +24,7 @@
<themes>
<theme>
- <name>empty</name>
+ <name>simple</name>
+ <link rel="stylesheet" id="main_css"
href="/themes/style.css" type="text/css"/>
</theme>
</themes>
\ No newline at end of file
Added: trunk/theme/src/bin/test/theme-test-war/themes/style.css
===================================================================
--- trunk/theme/src/bin/test/theme-test-war/themes/style.css (rev
0)
+++ trunk/theme/src/bin/test/theme-test-war/themes/style.css 2007-04-06 14:30:52 UTC (rev
6934)
@@ -0,0 +1,5 @@
+div {
+ border: 1px solid black;
+ padding: 0px;
+ margin: 1px;
+}
\ No newline at end of file
Modified: trunk/theme/src/main/org/jboss/portal/test/theme/TestServlet.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/test/theme/TestServlet.java 2007-04-05 22:19:51
UTC (rev 6933)
+++ trunk/theme/src/main/org/jboss/portal/test/theme/TestServlet.java 2007-04-06 14:30:52
UTC (rev 6934)
@@ -40,6 +40,8 @@
import org.jboss.portal.common.util.MarkupInfo;
import org.jboss.portal.server.ServerRequest;
import org.jboss.portal.test.theme.tmp.servlet.TestThemeServlet;
+import org.jboss.portal.web.ServletContextDispatcher;
+import org.jboss.portal.web.spi.ServletContainerContext;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@@ -77,17 +79,26 @@
MBeanServer mbeanServer = MBeanServerLocator.locateJBoss();
// Get services
+ ServletContainerContext servletContainerContext =
(ServletContainerContext)MBeanProxy.get(ServletContainerContext.class, new
ObjectName("portal:service=ServletContainerContext"), mbeanServer);
LayoutService layoutService = (LayoutService)MBeanProxy.get(LayoutService.class,
new ObjectName("portal:service=LayoutService"), mbeanServer);
ThemeService themeService = (ThemeService)MBeanProxy.get(ThemeService.class, new
ObjectName("portal:service=ThemeService"), mbeanServer);
PortalRenderSet renderSet = layoutService.getRenderSet("divRenderer",
MediaType.HTML);
PortalLayout layout = layoutService.getLayout("generic", true);
- PortalTheme theme = themeService.getTheme("empty", true);
+ PortalTheme theme = themeService.getTheme("simple", true);
+ System.out.println("renderSet = " + renderSet);
+ System.out.println("layout = " + layout);
+ System.out.println("theme = " + theme);
+
// Build a page structure
PageResult pageRenderCtx = new PageResult("test_page");
//
+ pageRenderCtx.setTheme(theme);
+ pageRenderCtx.setLayoutState(null);
+
+ //
pageRenderCtx.getPageProperties().put(DynaConstants.JAVASCRIPT_BASE,
"/portal-ajax");
pageRenderCtx.getPageProperties().put(DynaConstants.ASYNC_SERVER_URL,
"http://localhost:8080/portal-ajax/ajax");
@@ -95,7 +106,6 @@
pageRenderCtx.getPortalProperties().put(ThemeConstants.PORTAL_PROP_THEME,
theme.getThemeInfo().getName());
pageRenderCtx.getPortalProperties().put(ThemeConstants.PORTAL_PROP_RENDERSET,
renderSet.getName());
pageRenderCtx.getPortalProperties().put(ThemeConstants.PORTAL_PROP_LAYOUT,
layout.getLayoutInfo().getName());
- pageRenderCtx.setLayoutState(null);
//
for (int i = 0; i < 2; i++)
@@ -110,9 +120,17 @@
}
//
- MarkupInfo markupInfo = new MarkupInfo(MediaType.HTML, "utf-8");
- RenderContext renderCtx = layout.getRenderContext(markupInfo, null);
+ MarkupInfo markupInfo = new MarkupInfo(MediaType.HTML, "UTF-8");
+ ServletContextDispatcher dispatcher = new ServletContextDispatcher(request,
response, servletContainerContext);
+
+ RenderContext renderCtx = layout.getRenderContext(markupInfo, dispatcher);
+
+ renderCtx.setAttribute(ThemeConstants.ATTR_THEME, theme);
+
+ renderCtx.render(pageRenderCtx);
+
+
// //
// ServerRequest serverRequest = new ServerRequest(null);
//
Modified: trunk/theme/src/main/org/jboss/portal/theme/PortalLayout.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/PortalLayout.java 2007-04-05 22:19:51 UTC
(rev 6933)
+++ trunk/theme/src/main/org/jboss/portal/theme/PortalLayout.java 2007-04-06 14:30:52 UTC
(rev 6934)
@@ -28,6 +28,8 @@
import org.jboss.portal.theme.render.PageRenderer;
import org.jboss.portal.web.ServletContextDispatcher;
+import java.io.Writer;
+
/**
* Implementation of a <code>PortalLayout</code>. <p>An instance of
this class represents the meta data of a portal
* layout.</p>
@@ -66,5 +68,23 @@
return serviceInfo;
}
+ /**
+ * Provides a render context that will render its markup in the response provided by
the servlet context
+ * dispatcher.
+ *
+ * @param markupInfo
+ * @param dispatcher
+ * @return
+ */
public abstract RenderContext getRenderContext(MarkupInfo markupInfo,
ServletContextDispatcher dispatcher);
+
+ /**
+ * Provides a render context that will render its markup in the provided writer.
+ *
+ * @param markupInfo
+ * @param dispatcher
+ * @param writer
+ * @return
+ */
+ public abstract RenderContext getRenderContext(MarkupInfo markupInfo,
ServletContextDispatcher dispatcher, Writer writer);
}
Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/JSPLayout.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/impl/JSPLayout.java 2007-04-05 22:19:51
UTC (rev 6933)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/JSPLayout.java 2007-04-06 14:30:52
UTC (rev 6934)
@@ -39,6 +39,8 @@
import javax.servlet.ServletException;
import java.io.IOException;
+import java.io.Writer;
+import java.io.PrintWriter;
import java.util.Iterator;
/**
@@ -56,9 +58,18 @@
RendererFactory factory = new RendererFactoryImpl(this, serviceInfo, info);
//
- return new RenderContext(factory, dispatcher, markupInfo);
+ return new JSPRenderContext(factory, dispatcher, markupInfo);
}
+
+ public RenderContext getRenderContext(MarkupInfo markupInfo, ServletContextDispatcher
dispatcher, Writer writer)
+ {
+ RendererFactory factory = new RendererFactoryImpl(this, serviceInfo, info);
+
+ //
+ return new WriterRenderContext(factory, dispatcher, markupInfo, new
PrintWriter(writer));
+ }
+
public void render(RenderContext renderContext, PageRenderContext prc) throws
RenderException
{
PageResult pageResult = (PageResult)prc;
Added: trunk/theme/src/main/org/jboss/portal/theme/impl/JSPRenderContext.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/impl/JSPRenderContext.java
(rev 0)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/JSPRenderContext.java 2007-04-06
14:30:52 UTC (rev 6934)
@@ -0,0 +1,63 @@
+/******************************************************************************
+ * 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.jboss.portal.theme.impl;
+
+import org.jboss.portal.theme.render.RenderContext;
+import org.jboss.portal.theme.render.RendererFactory;
+import org.jboss.portal.theme.render.ObjectRenderContext;
+import org.jboss.portal.theme.render.RenderException;
+import org.jboss.portal.web.ServletContextDispatcher;
+import org.jboss.portal.common.util.MarkupInfo;
+
+import java.io.PrintWriter;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public class JSPRenderContext extends RenderContext
+{
+
+ /** The writer provided by the JSP tag lib, the tag lib will flush the writer at the
right time. */
+ private PrintWriter writer;
+
+ public JSPRenderContext(RendererFactory rendererFactory, ServletContextDispatcher
dispatcher, MarkupInfo markupInfo)
+ {
+ super(rendererFactory, dispatcher, markupInfo);
+ }
+
+ public PrintWriter getWriter()
+ {
+ return writer;
+ }
+
+ public void setWriter(PrintWriter writer)
+ {
+ this.writer = writer;
+ }
+
+ public void render(ObjectRenderContext ctx) throws RenderException,
IllegalStateException
+ {
+ super.render(ctx);
+ }
+}
Added: trunk/theme/src/main/org/jboss/portal/theme/impl/WriterRenderContext.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/impl/WriterRenderContext.java
(rev 0)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/WriterRenderContext.java 2007-04-06
14:30:52 UTC (rev 6934)
@@ -0,0 +1,68 @@
+/******************************************************************************
+ * 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.jboss.portal.theme.impl;
+
+import org.jboss.portal.theme.render.RenderContext;
+import org.jboss.portal.theme.render.RendererFactory;
+import org.jboss.portal.theme.render.ObjectRenderContext;
+import org.jboss.portal.theme.render.RenderException;
+import org.jboss.portal.web.ServletContextDispatcher;
+import org.jboss.portal.common.util.MarkupInfo;
+
+import java.io.PrintWriter;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public class WriterRenderContext extends RenderContext
+{
+
+ /** The provided writer by the caller of the rendering process. */
+ private final PrintWriter writer;
+
+ public WriterRenderContext(
+ RendererFactory rendererFactory,
+ ServletContextDispatcher dispatcher,
+ MarkupInfo markupInfo,
+ PrintWriter writer)
+ {
+ super(rendererFactory, dispatcher, markupInfo);
+
+ //
+ this.writer = writer;
+ }
+
+ public PrintWriter getWriter()
+ {
+ return writer;
+ }
+
+ public void render(ObjectRenderContext ctx) throws RenderException,
IllegalStateException
+ {
+ super.render(ctx);
+
+ //
+ writer.flush();
+ }
+}
Modified:
trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java
===================================================================
---
trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java 2007-04-05
22:19:51 UTC (rev 6933)
+++
trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java 2007-04-06
14:30:52 UTC (rev 6934)
@@ -37,6 +37,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.io.PrintWriter;
/**
* Implementation of a decoration renderer, based on div tags.
@@ -51,21 +52,21 @@
public void render(RenderContext renderContext, DecorationRenderContext drc) throws
RenderException
{
- StringBuffer markup = renderContext.getMarkupFragment();
+ PrintWriter markup = renderContext.getWriter();
renderTitle(renderContext, drc);
- markup.append("<div class=\"portlet-mode-container\">");
+ markup.print("<div class=\"portlet-mode-container\">");
renderModeAndStateLinks(renderContext, drc, ActionRenderContext.MODES_KEY);
renderModeAndStateLinks(renderContext, drc, ActionRenderContext.WINDOWSTATES_KEY);
- markup.append("</div>");
+ markup.print("</div>");
}
private static void renderTitle(RenderContext ctx, DecorationRenderContext drc)
{
- StringBuffer out = ctx.getMarkupFragment();
- out.append("<div
class=\"portlet-titlebar-decoration\">");
- out.append("<span class=\"portlet-titlebar-title\">");
- out.append(drc.getTitle());
- out.append("</span></div>");
+ PrintWriter out = ctx.getWriter();
+ out.print("<div
class=\"portlet-titlebar-decoration\">");
+ out.print("<span class=\"portlet-titlebar-title\">");
+ out.print(drc.getTitle());
+ out.print("</span></div>");
}
private static void renderModeAndStateLinks(RenderContext ctx, DecorationRenderContext
drc, String selector)
@@ -88,8 +89,14 @@
ActionRenderContext action = (ActionRenderContext)i.next();
if (action.isEnabled())
{
- StringBuffer out = ctx.getMarkupFragment();
- out.append("<span
title=\"").append(action.getName()).append("\"><a
class=\"portlet-mode-").append(action.getName()).append("\"
href=\"").append(action.getURL()).append("\"> </a></span>");
+ PrintWriter out = ctx.getWriter();
+ out.print("<span title=\"");
+ out.print(action.getName());
+ out.print("\"><a class=\"portlet-mode-");
+ out.print(action.getName());
+ out.print("\" href=\"");
+ out.print(action.getURL());
+ out.print("\"> </a></span>");
}
}
}
Modified:
trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivPortletRenderer.java
===================================================================
---
trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivPortletRenderer.java 2007-04-05
22:19:51 UTC (rev 6933)
+++
trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivPortletRenderer.java 2007-04-06
14:30:52 UTC (rev 6934)
@@ -27,6 +27,8 @@
import org.jboss.portal.theme.render.RenderException;
import org.jboss.portal.theme.render.PortletRenderContext;
+import java.io.PrintWriter;
+
/**
* Implementation of a Portlet renderer, based on div tags.
*
@@ -38,7 +40,7 @@
{
public void render(RenderContext renderContext, PortletRenderContext prc) throws
RenderException
{
- StringBuffer out = renderContext.getMarkupFragment();
- out.append(prc.getMarkup());
+ PrintWriter out = renderContext.getWriter();
+ out.print(prc.getMarkup());
}
}
Modified:
trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivRegionRenderer.java
===================================================================
---
trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivRegionRenderer.java 2007-04-05
22:19:51 UTC (rev 6933)
+++
trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivRegionRenderer.java 2007-04-06
14:30:52 UTC (rev 6934)
@@ -29,6 +29,7 @@
import org.jboss.portal.theme.render.WindowRenderContext;
import java.util.Iterator;
+import java.io.PrintWriter;
/**
* Implementation of a Region renderer, based on div tags.
@@ -44,16 +45,18 @@
public void renderHeader(RenderContext renderContext, RegionRenderContext rrc) throws
RenderException
{
- StringBuffer markup = renderContext.getMarkupFragment();
- markup.append("<div");
+ PrintWriter markup = renderContext.getWriter();
+ markup.print("<div");
if (rrc == null) // || region.getWindows().size() <= 0)
{
- markup.append(" class='empty-region' />");
+ markup.print(" class='empty-region' />");
}
else if (rrc.getCSSId() != null)
{
- markup.append("
id='").append(rrc.getCSSId()).append("'>");
+ markup.print(" id='");
+ markup.print(rrc.getCSSId());
+ markup.print("'>");
}
}
@@ -68,7 +71,7 @@
public void renderFooter(RenderContext renderContext, RegionRenderContext rrc) throws
RenderException
{
- StringBuffer markup = renderContext.getMarkupFragment();
- markup.append("</div>");
+ PrintWriter markup = renderContext.getWriter();
+ markup.print("</div>");
}
}
Modified:
trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivWindowRenderer.java
===================================================================
---
trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivWindowRenderer.java 2007-04-05
22:19:51 UTC (rev 6933)
+++
trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivWindowRenderer.java 2007-04-06
14:30:52 UTC (rev 6934)
@@ -27,6 +27,8 @@
import org.jboss.portal.theme.render.WindowRenderer;
import org.jboss.portal.theme.render.WindowRenderContext;
+import java.io.PrintWriter;
+
/**
* Implementation of a WindowRenderer, based on div tags.
*
@@ -39,26 +41,26 @@
{
public void render(RenderContext renderContext, WindowRenderContext wrc) throws
RenderException
{
- StringBuffer out = renderContext.getMarkupFragment();
- out.append("<div class=\"portlet-container\">");
- out.append("<table width=\"100%\" border=\"0\"
cellpadding=\"0\" cellspacing=\"0\">");
+ PrintWriter out = renderContext.getWriter();
+ out.print("<div class=\"portlet-container\">");
+ out.print("<table width=\"100%\" border=\"0\"
cellpadding=\"0\" cellspacing=\"0\">");
//
- out.append("<tr><td
class=\"portlet-titlebar-left\"></td>");
- out.append("<td class=\"portlet-titlebar-center\">");
+ out.print("<tr><td
class=\"portlet-titlebar-left\"></td>");
+ out.print("<td class=\"portlet-titlebar-center\">");
renderContext.render(wrc.getDecoration());
- out.append("</td><td
class=\"portlet-titlebar-right\"></td></tr>");
+ out.print("</td><td
class=\"portlet-titlebar-right\"></td></tr>");
//
- out.append("<tr><td
class=\"portlet-content-left\"></td>");
- out.append("<td class=\"portlet-body\"><div
class=\"portlet-content-center\">");
+ out.print("<tr><td
class=\"portlet-content-left\"></td>");
+ out.print("<td class=\"portlet-body\"><div
class=\"portlet-content-center\">");
renderContext.render(wrc.getPortlet());
- out.append("</div></td><td
class=\"portlet-content-right\"></td></tr>");
+ out.print("</div></td><td
class=\"portlet-content-right\"></td></tr>");
//
- out.append("<tr><td
class=\"portlet-footer-left\"></td>");
- out.append("<td
class=\"portlet-footer-center\"></td>");
- out.append("<td
class=\"portlet-footer-right\"></td></tr>");
- out.append("</table></div>");
+ out.print("<tr><td
class=\"portlet-footer-left\"></td>");
+ out.print("<td
class=\"portlet-footer-center\"></td>");
+ out.print("<td
class=\"portlet-footer-right\"></td></tr>");
+ out.print("</table></div>");
}
}
Modified:
trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java
===================================================================
---
trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java 2007-04-05
22:19:51 UTC (rev 6933)
+++
trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java 2007-04-06
14:30:52 UTC (rev 6934)
@@ -27,6 +27,8 @@
import org.jboss.portal.theme.render.RenderException;
import org.jboss.portal.theme.render.DecorationRenderContext;
+import java.io.PrintWriter;
+
/**
* Implementation of a drag and drop decoration renderer.
*
@@ -55,12 +57,12 @@
DynaWindowRenderer.handleProvided.set(Boolean.TRUE);
//
- StringBuffer markup = renderContext.getMarkupFragment();
- markup.append("<div class=\"dyna-decoration\">\n");
- markup.append("<div class=\"handle\">");
+ PrintWriter markup = renderContext.getWriter();
+ markup.print("<div class=\"dyna-decoration\">\n");
+ markup.print("<div class=\"handle\">");
delegate.render(renderContext, drc);
- markup.append("</div>\n");
- markup.append("</div>\n");
+ markup.print("</div>\n");
+ markup.print("</div>\n");
}
else
{
Modified:
trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java
===================================================================
---
trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java 2007-04-05
22:19:51 UTC (rev 6933)
+++
trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java 2007-04-06
14:30:52 UTC (rev 6934)
@@ -28,6 +28,8 @@
import org.jboss.portal.theme.render.RenderException;
import org.jboss.portal.theme.render.PortletRenderContext;
+import java.io.PrintWriter;
+
/**
* Implementation of a drag and drop Portlet renderer.
*
@@ -85,10 +87,10 @@
{
if (Boolean.TRUE == renderContext.getAttribute(DynaConstants.AJAX_WINDOW_ENABLED))
{
- StringBuffer out = renderContext.getMarkupFragment();
- out.append("<div class=\"dyna-portlet\">");
+ PrintWriter out = renderContext.getWriter();
+ out.print("<div class=\"dyna-portlet\">");
delegate.render(renderContext, prc);
- out.append("</div>");
+ out.print("</div>");
}
else
{
Modified:
trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java
===================================================================
---
trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java 2007-04-05
22:19:51 UTC (rev 6933)
+++
trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java 2007-04-06
14:30:52 UTC (rev 6934)
@@ -50,6 +50,8 @@
import org.jboss.portal.theme.render.RenderException;
import org.jboss.portal.theme.render.RegionRenderContext;
+import java.io.PrintWriter;
+
/**
* Implementation of a drag and drop Region renderer.
*
@@ -73,7 +75,7 @@
public void renderHeader(RenderContext renderContext, RegionRenderContext rrc) throws
RenderException
{
- StringBuffer markup = renderContext.getMarkupFragment();
+ PrintWriter markup = renderContext.getWriter();
String jsBase = renderContext.getProperty(DynaConstants.JAVASCRIPT_BASE);
String asyncServerURL = renderContext.getProperty(DynaConstants.ASYNC_SERVER_URL);
String viewState = renderContext.getProperty(DynaConstants.VIEW_STATE);
@@ -89,28 +91,42 @@
// Handle special ajax region here
if ("AJAXScripts".equals(rrc.getId()))
{
- markup.append("<script type='text/javascript'
src='").append(jsBase).append("/js/portal/prototype.js'></script>\n");
- markup.append("<script type='text/javascript'
src='").append(jsBase).append("/js/portal/scriptaculous.js'></script>\n");
- markup.append("<script type='text/javascript'
src='").append(jsBase).append("/js/portal/effects.js'></script>\n");
- markup.append("<script type='text/javascript'
src='").append(jsBase).append("/js/portal/dragdrop.js'></script>\n");
- markup.append("<script type='text/javascript'
src='").append(jsBase).append("/js/portal/dyna.js'></script>\n");
- markup.append("<script type='text/javascript'>\n");
+ markup.print("<script type='text/javascript'
src='");
+ markup.print(jsBase);
+ markup.print("/js/portal/prototype.js'></script>\n");
+ markup.print("<script type='text/javascript'
src='");
+ markup.print(jsBase);
+
markup.print("/js/portal/scriptaculous.js'></script>\n");
+ markup.print("<script type='text/javascript'
src='");
+ markup.print(jsBase);
+ markup.print("/js/portal/effects.js'></script>\n");
+ markup.print("<script type='text/javascript'
src='");
+ markup.print(jsBase);
+ markup.print("/js/portal/dragdrop.js'></script>\n");
+ markup.print("<script type='text/javascript'
src='");
+ markup.print(jsBase);
+ markup.print("/js/portal/dyna.js'></script>\n");
+ markup.print("<script type='text/javascript'>\n");
// Async server URL needed for callbacks
-
markup.append("async_server_url=\"").append(asyncServerURL).append("\";\n");
+ markup.print("async_server_url=\"");
+ markup.print(asyncServerURL);
+ markup.print("\";\n");
// View state if not null
if (viewState != null)
{
-
markup.append("view_state=\"").append(viewState).append("\";\n");
+ markup.print("view_state=\"");
+ markup.print(viewState);
+ markup.print("\";\n");
}
//
- markup.append("</script>\n");
+ markup.print("</script>\n");
}
else if ("AJAXFooter".equals(rrc.getId()))
{
- markup.append("<script
type='text/javascript'>footer()</script>\n");
+ markup.print("<script
type='text/javascript'>footer()</script>\n");
}
else
{
@@ -129,7 +145,9 @@
delegate.renderHeader(renderContext, rrc);
// We need height and width otherwise the region will not be usable when empty
- markup.append("<div class=\"dyna-region\"
style=\"height:200px;width=200px\"
id=\"").append(rrc.getId()).append("\">");
+ markup.print("<div class=\"dyna-region\"
style=\"height:200px;width=200px\" id=\"");
+ markup.print(rrc.getId());
+ markup.print("\">");
}
else
{
@@ -142,10 +160,10 @@
//
if (Boolean.TRUE == renderContext.getAttribute(DynaConstants.AJAX_WINDOW_ENABLED))
{
- StringBuffer markup = renderContext.getMarkupFragment();
+ PrintWriter markup = renderContext.getWriter();
//
- markup.append("</div>");
+ markup.print("</div>");
}
//
Modified:
trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaWindowRenderer.java
===================================================================
---
trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaWindowRenderer.java 2007-04-05
22:19:51 UTC (rev 6933)
+++
trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaWindowRenderer.java 2007-04-06
14:30:52 UTC (rev 6934)
@@ -28,6 +28,8 @@
import org.jboss.portal.theme.render.WindowRenderer;
import org.jboss.portal.theme.render.WindowRenderContext;
+import java.io.PrintWriter;
+
/**
* Implementation of a drag and drop WindowRenderer.
*
@@ -60,10 +62,12 @@
handleProvided.set(Boolean.FALSE);
//
- StringBuffer out = renderContext.getMarkupFragment();
- out.append("<div class=\"dyna-window\"><div
id=\"").append(wrc.getId()).append("\"/>\n");
+ PrintWriter out = renderContext.getWriter();
+ out.print("<div class=\"dyna-window\"><div
id=\"");
+ out.print(wrc.getId());
+ out.print("\"/>\n");
delegate.render(renderContext, wrc);
- out.append("</div></div>\n");
+ out.print("</div></div>\n");
//
handleProvided.set(null);
Modified:
trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyPortletRenderer.java
===================================================================
---
trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyPortletRenderer.java 2007-04-05
22:19:51 UTC (rev 6933)
+++
trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyPortletRenderer.java 2007-04-06
14:30:52 UTC (rev 6934)
@@ -39,6 +39,6 @@
{
public void render(RenderContext renderContext, PortletRenderContext prc) throws
RenderException
{
- renderContext.getMarkupFragment().append(prc.getMarkup());
+ renderContext.getWriter().print(prc.getMarkup());
}
}
Modified:
trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyRegionRenderer.java
===================================================================
---
trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyRegionRenderer.java 2007-04-05
22:19:51 UTC (rev 6933)
+++
trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyRegionRenderer.java 2007-04-06
14:30:52 UTC (rev 6934)
@@ -67,7 +67,6 @@
{
WindowRenderContext window = (WindowRenderContext)i.next();
orderedItems.put(new Integer(window.getOrder()), window);
- log.debug("got window to render: " + window.getId());
}
//
Modified: trunk/theme/src/main/org/jboss/portal/theme/render/RenderContext.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/render/RenderContext.java 2007-04-05
22:19:51 UTC (rev 6933)
+++ trunk/theme/src/main/org/jboss/portal/theme/render/RenderContext.java 2007-04-06
14:30:52 UTC (rev 6934)
@@ -29,6 +29,7 @@
import java.util.ArrayList;
import java.util.Map;
import java.util.HashMap;
+import java.io.PrintWriter;
/**
* A render context to render a context on a page. <p>A render context is scoped to
a MarkupContainer (a region, or a
@@ -38,7 +39,7 @@
* @author <a href="mailto:mholzner@novell.com>Martin Holzner</a>
* @version $LastChangedRevision$, $LastChangedDate$
*/
-public final class RenderContext
+public abstract class RenderContext
{
/** . */
@@ -48,9 +49,6 @@
private ServletContextDispatcher dispatcher;
/** . */
- private StringBuffer markup;
-
- /** . */
private MarkupInfo markupInfo;
/** . */
@@ -85,20 +83,16 @@
this.dispatcher = dispatcher;
this.markupInfo = markupInfo;
this.stack = new ArrayList(6);
- this.markup = new StringBuffer();
this.attributes = new HashMap();
}
+ public abstract PrintWriter getWriter();
+
public ServletContextDispatcher getDispatcher()
{
return dispatcher;
}
- public StringBuffer getMarkupFragment()
- {
- return markup;
- }
-
public MarkupInfo getMarkupInfo()
{
return markupInfo;
@@ -163,7 +157,7 @@
return (ObjectRenderContext)stack.remove(stack.size() - 1);
}
- public void render(ObjectRenderContext ctx) throws RenderException
+ public void render(ObjectRenderContext ctx) throws RenderException,
IllegalStateException
{
pushObjectRenderContext(ctx);
Modified: trunk/theme/src/main/org/jboss/portal/theme/tag/HeaderContentTagHandler.java
===================================================================
---
trunk/theme/src/main/org/jboss/portal/theme/tag/HeaderContentTagHandler.java 2007-04-05
22:19:51 UTC (rev 6933)
+++
trunk/theme/src/main/org/jboss/portal/theme/tag/HeaderContentTagHandler.java 2007-04-06
14:30:52 UTC (rev 6934)
@@ -59,8 +59,7 @@
if (page == null)
{
out.write("<p bgcolor='red'>No page to
render!</p>");
- out.write("<p bgcolor='red'>The page to render (PageResult)
must be set in the request attribute '" +
- LayoutConstants.ATTR_PAGE + "'</p>");
+ out.write("<p bgcolor='red'>The page to render (PageResult)
must be set in the request attribute '" + LayoutConstants.ATTR_PAGE +
"'</p>");
out.flush();
return;
}
Modified: trunk/theme/src/main/org/jboss/portal/theme/tag/RegionTagHandler.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/tag/RegionTagHandler.java 2007-04-05
22:19:51 UTC (rev 6933)
+++ trunk/theme/src/main/org/jboss/portal/theme/tag/RegionTagHandler.java 2007-04-06
14:30:52 UTC (rev 6934)
@@ -25,7 +25,7 @@
import org.jboss.logging.Logger;
import org.jboss.portal.theme.LayoutConstants;
import org.jboss.portal.theme.Orientation;
-import org.jboss.portal.theme.render.RenderContext;
+import org.jboss.portal.theme.impl.JSPRenderContext;
import org.jboss.portal.theme.render.RenderException;
import org.jboss.portal.theme.render.RegionRenderContext;
import org.jboss.portal.theme.render.PageRenderContext;
@@ -36,6 +36,7 @@
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.SimpleTagSupport;
import java.io.IOException;
+import java.io.PrintWriter;
import java.util.Collection;
import java.util.Collections;
@@ -122,26 +123,23 @@
}
};
- RenderContext renderContext =
(RenderContext)request.getAttribute(LayoutConstants.ATTR_RENDERCONTEXT);
+ JSPRenderContext renderContext =
(JSPRenderContext)request.getAttribute(LayoutConstants.ATTR_RENDERCONTEXT);
try
{
+ PrintWriter pw = new PrintWriter(out);
+ renderContext.setWriter(pw);
renderContext.render(rrc);
- out.write(renderContext.getMarkupFragment().toString());
- out.flush();
+ pw.flush();
}
catch (RenderException e)
{
throw new JspException(e);
}
- finally
- {
- renderContext.getMarkupFragment().setLength(0);
- }
}
else
{
// window-centric display of content
- RenderContext renderContext =
(RenderContext)request.getAttribute(LayoutConstants.ATTR_RENDERCONTEXT);
+ JSPRenderContext renderContext =
(JSPRenderContext)request.getAttribute(LayoutConstants.ATTR_RENDERCONTEXT);
if (renderContext == null)
{
log.debug("no render context available in request");
@@ -178,18 +176,15 @@
};
try
{
+ PrintWriter pw = new PrintWriter(out);
+ renderContext.setWriter(pw);
renderContext.render(rrc);
- out.write(renderContext.getMarkupFragment().toString());
- out.flush();
+ pw.flush();
}
catch (RenderException e)
{
throw new JspException(e);
}
- finally
- {
- renderContext.getMarkupFragment().setLength(0);
- }
log.debug("done rendering page region [" + regionName +
"]");
}
Modified: trunk/theme/src/main/org/jboss/portal/theme/tag/ThemeTagHandler.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/tag/ThemeTagHandler.java 2007-04-05
22:19:51 UTC (rev 6933)
+++ trunk/theme/src/main/org/jboss/portal/theme/tag/ThemeTagHandler.java 2007-04-06
14:30:52 UTC (rev 6934)
@@ -76,10 +76,6 @@
public void doTag() throws JspException, IOException
{
boolean trace = log.isTraceEnabled();
- if (trace)
- {
- log.trace("rendering theme ...");
- }
// get page and region
PageContext app = (PageContext)getJspContext();
Modified: trunk/theme/src/resources/test/theme-test-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/theme/src/resources/test/theme-test-sar/META-INF/jboss-service.xml 2007-04-05
22:19:51 UTC (rev 6933)
+++ trunk/theme/src/resources/test/theme-test-sar/META-INF/jboss-service.xml 2007-04-06
14:30:52 UTC (rev 6934)
@@ -62,6 +62,15 @@
<attribute name="ConfigLocation">conf/config.xml</attribute>
</mbean>
+ <!-- Runtime context for running portlet container -->
+ <mbean
+ code="org.jboss.portal.web.jboss.JBossWebContext"
+ name="portal:service=ServletContainerContext"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ </mbean>
+
<!-- Server -->
<mbean
code="org.jboss.portal.server.impl.ServerImpl"
@@ -70,6 +79,7 @@
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends optional-attribute-name="Config"
proxy-type="attribute">portal:service=ServerConfig</depends>
+ <depends optional-attribute-name="ServletContainerContext"
proxy-type="attribute">portal:service=ServletContainerContext</depends>
</mbean>
<!-- Server deployer -->
Deleted: trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-layouts.xml
===================================================================
--- trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-layouts.xml 2007-04-05
22:19:51 UTC (rev 6933)
+++ trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-layouts.xml 2007-04-06
14:30:52 UTC (rev 6934)
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ 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. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<layouts>
- <!--
- <layout>
- <name>nodesk</name>
- <uri>/nodesk/index.jsp</uri>
- <uri state="maximized">/nodesk/index.jsp</uri>
- <regions>
- <region name="left"/>
- <region name="center"/>
- </regions>
- </layout>
- <layout>
- <name>phalanx</name>
- <uri>/phalanx/index.jsp</uri>
- <uri state="maximized">/phalanx/index.jsp</uri>
- <regions>
- <region name="left"/>
- <region name="center"/>
- </regions>
- </layout>
- -->
- <layout>
- <name>generic</name>
- <uri>/layouts/generic/index.jsp</uri>
- <uri state="maximized">/layouts/generic/maximized.jsp</uri>
- <regions>
- <region name="left"/>
- <region name="center"/>
- <region name="navigation"/>
- </regions>
- </layout>
-</layouts>
Deleted: trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-themes.xml
===================================================================
--- trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-themes.xml 2007-04-05
22:19:51 UTC (rev 6933)
+++ trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-themes.xml 2007-04-06
14:30:52 UTC (rev 6934)
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ 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. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<themes>
- <!--
- <theme>
- <name>industrial</name>
- <link rel="stylesheet" id="main_css"
href="/themes/industrial/portal_style.css" type="text/css" />
- <link rel="shortcut icon"
href="/themes/industrial/images/favicon.ico" />
- </theme>
- <theme>
- <name>Nphalanx</name>
- <link rel="stylesheet" id="main_css"
href="/themes/phalanx/portal_style.css" type="text/css" />
- <link rel="shortcut icon"
href="/themes/phalanx/images/favicon.ico" />
- </theme>
- <theme>
- <name>mission-critical</name>
- <link rel="stylesheet" id="main_css"
href="/themes/mission-critical/portal_style.css" type="text/css"
/>
- <link rel="shortcut icon"
href="/themes/mission-critical/images/favicon.ico" />
- </theme>
- <theme>
- <name>Maple</name>
- <link rel="stylesheet" id="main_css"
href="/themes/maple/portal_style.css" type="text/css"/>
- <link rel="shortcut icon"
href="/themes/maple/images/favicon.ico"/>
- </theme>
- -->
- <theme>
- <name>renaissance</name>
- <link rel="stylesheet" id="main_css"
href="/themes/renaissance/portal_style.css" type="text/css"/>
- <link rel="shortcut icon"
href="/themes/renaissance/images/favicon.ico"/>
- <link rel="icon"
href="/themes/renaissance/images/animated_favicon1.gif"
type="image/gif"/>
- </theme>
-</themes>
\ No newline at end of file
Modified: trunk/theme/src/resources/test/theme-test-war/WEB-INF/web.xml
===================================================================
--- trunk/theme/src/resources/test/theme-test-war/WEB-INF/web.xml 2007-04-05 22:19:51 UTC
(rev 6933)
+++ trunk/theme/src/resources/test/theme-test-war/WEB-INF/web.xml 2007-04-06 14:30:52 UTC
(rev 6934)
@@ -37,17 +37,13 @@
</servlet>
<servlet>
<description>Renders a theme for testing</description>
- <servlet-name>TestThemeServlet</servlet-name>
-
<servlet-class>org.jboss.portal.test.theme.tmp.servlet.TestThemeServlet</servlet-class>
+ <servlet-name>TestServlet</servlet-name>
+ <servlet-class>org.jboss.portal.test.theme.TestServlet</servlet-class>
<load-on-startup>0</load-on-startup>
</servlet>
<servlet-mapping>
- <servlet-name>TestAJAXServlet</servlet-name>
- <url-pattern>/testajax/*</url-pattern>
+ <servlet-name>TestServlet</servlet-name>
+ <url-pattern>/test/*</url-pattern>
</servlet-mapping>
- <servlet-mapping>
- <servlet-name>TestThemeServlet</servlet-name>
- <url-pattern>/testtheme/*</url-pattern>
- </servlet-mapping>
</web-app>