Author: julien(a)jboss.com
Date: 2008-02-07 18:34:46 -0500 (Thu, 07 Feb 2008)
New Revision: 9842
Added:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortalSimpleTagSupport.java
Removed:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/Page.java
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/Window.java
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/BytesChunk.java
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/CharsChunk.java
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/Chunk.java
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/EndPageChunk.java
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/ResponseBuffer.java
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/StartPageChunk.java
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/portlet/EndPortletChunk.java
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/portlet/PortletMarkupChunk.java
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/portlet/PortletURLChunk.java
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/portlet/StartPortletTitleChunk.java
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/BodyChunkTagSupport.java
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/SimpleChunkTagSupport.java
Modified:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/ControllerFilter.java
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/BufferingResponse.java
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/portlet/StartPortletChunk.java
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/AbstractURLTag.java
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PageTag.java
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletMarkupTag.java
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletTag.java
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletTitleTag.java
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletURLTag.java
Log:
remove the chunk junk
Modified:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/ControllerFilter.java
===================================================================
---
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/ControllerFilter.java 2008-02-07
22:34:26 UTC (rev 9841)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/ControllerFilter.java 2008-02-07
23:34:46 UTC (rev 9842)
@@ -22,21 +22,10 @@
******************************************************************************/
package org.jboss.portal.portlet.test.jsp;
-import org.jboss.portal.portlet.test.jsp.response.Chunk;
-import org.jboss.portal.portlet.test.jsp.response.BytesChunk;
-import org.jboss.portal.portlet.test.jsp.response.CharsChunk;
-import org.jboss.portal.portlet.test.jsp.response.portlet.StartPortletChunk;
-import org.jboss.portal.portlet.test.jsp.response.portlet.PortletMarkupChunk;
-import org.jboss.portal.portlet.test.jsp.response.portlet.StartPortletTitleChunk;
-import org.jboss.portal.portlet.test.jsp.response.portlet.PortletURLChunk;
-import org.jboss.portal.portlet.test.jsp.response.portlet.EndPortletChunk;
import org.jboss.portal.portlet.test.jsp.response.BufferingResponse;
-import org.jboss.portal.portlet.test.jsp.response.ResponseBuffer;
import org.jboss.portal.portlet.test.controller.PortletURLRenderer;
import org.jboss.portal.portlet.PortletInvoker;
import org.jboss.portal.portlet.PortletInvokerException;
-import org.jboss.portal.portlet.RenderURL;
-import org.jboss.portal.portlet.StateString;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
import org.jboss.portal.portlet.invocation.response.FragmentResponse;
import org.jboss.portal.portlet.controller.PortletController;
@@ -46,10 +35,7 @@
import org.jboss.portal.portlet.controller.response.PageUpdateResponse;
import org.jboss.portal.portlet.controller.response.ResourceResponse;
import org.jboss.portal.portlet.controller.state.PageNavigationalState;
-import org.jboss.portal.portlet.controller.state.WindowNavigationalState;
import org.jboss.portal.common.io.IOTools;
-import org.jboss.portal.Mode;
-import org.jboss.portal.WindowState;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -63,9 +49,6 @@
import javax.servlet.ServletContext;
import java.io.IOException;
import java.io.Writer;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.util.Map;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -228,20 +211,6 @@
//
chain.doFilter(req, bufferingResponse);
-
- //
- ResponseBuffer buffer = bufferingResponse.getBuffer();
- buffer.close();
-
- //
- try
- {
- render(req, bufferingResponse);
- }
- catch (ClassNotFoundException e)
- {
- throw new ServletException(e);
- }
}
public void destroy()
@@ -253,7 +222,7 @@
{
//
- PagePortletControllerContext context = resp.getPortletControllerContext();
+// PagePortletControllerContext context = resp.getPortletControllerContext();
//
@@ -322,141 +291,5 @@
}
}
*/
-
- //
-// Map<String, PortletInvocationResponse> responses = page.render(context,
pageState);
-
- //
- OutputStream out = resp.getResponse().getOutputStream();
- OutputStreamWriter writer = new OutputStreamWriter(out);
-
- //
- StartPortletChunk startPortletChunk = null;
- for (Chunk chunk : resp.getBuffer().getChunks())
- {
- if (chunk instanceof BytesChunk)
- {
- BytesChunk bytesChunk = (BytesChunk)chunk;
- out.write(bytesChunk.getBytes());
- out.flush();
- }
- else if (chunk instanceof CharsChunk)
- {
- CharsChunk bytesChunk = (CharsChunk)chunk;
- writer.write(bytesChunk.getChars());
- writer.flush();
- }
- else if (chunk instanceof StartPortletChunk)
- {
- startPortletChunk = (StartPortletChunk)chunk;
- }
- else if (chunk instanceof StartPortletTitleChunk)
- {
- PortletInvocationResponse portletResponse = startPortletChunk.getResponse();
- if (portletResponse != null)
- {
- if (portletResponse instanceof FragmentResponse)
- {
- FragmentResponse fragment = (FragmentResponse)portletResponse;
- writer.write(fragment.getTitle());
- writer.flush();
- }
- }
- }
- else if (chunk instanceof PortletURLChunk)
- {
- final PortletURLChunk portletURL = (PortletURLChunk)chunk;
- PortletInvocationResponse portletResponse = startPortletChunk.getResponse();
- if (portletResponse != null)
- {
- if (portletResponse instanceof FragmentResponse)
- {
- PortletURLRenderer renderer = new PortletURLRenderer(
- (StateControllerContextImpl)context.getStateControllerContext(),
- resp.getPageState(),
- context.getClientRequest(),
- context.getClientResponse());
-
- RenderURL url = new RenderURL()
- {
- public StateString getNavigationalState()
- {
- return null;
- }
-
- public Map<String, String[]>
getPublicNavigationalStateChanges()
- {
- return portletURL.getParams();
- }
-
- public Mode getMode()
- {
- return portletURL.getMode();
- }
-
- public WindowState getWindowState()
- {
- return portletURL.getWindowState();
- }
- };
-
- //
- String renderedURL =
renderer.renderURL(startPortletChunk.getWindowId(), url, null, null, true);
- writer.write(renderedURL);
- writer.flush();
- }
- }
- }
- else if (chunk instanceof PortletMarkupChunk)
- {
- PortletInvocationResponse portletResponse = startPortletChunk.getResponse();
- if (portletResponse != null)
- {
- if (portletResponse instanceof FragmentResponse)
- {
- FragmentResponse fragment = (FragmentResponse)portletResponse;
- WindowNavigationalState windowNS = null;
- if (resp.getPageState() != null)
- {
- windowNS =
resp.getPageState().getWindowNavigationalState(startPortletChunk.getWindowId());
- }
- if (windowNS == null ||
!windowNS.getWindowState().equals(WindowState.MINIMIZED))
- {
- if (fragment.getType() != FragmentResponse.TYPE_EMPTY)
- {
- String frag;
- if (fragment.getType() == FragmentResponse.TYPE_BYTES)
- {
- frag = fragment.getBytes().toString();
- }
- else
- {
- frag = fragment.getChars().toString();
- }
-
- //
- writer.write(frag);
- writer.flush();
- }
- }
- }
- else
- {
- writer.write(portletResponse.getClass().getSimpleName() + "["
+ startPortletChunk.getPortletName() + "," +
startPortletChunk.getApplicationName() + "]");
- writer.flush();
- }
- }
- else
- {
- writer.write("Empty[" + startPortletChunk.getPortletName() +
"," + startPortletChunk.getApplicationName() + "]");
- writer.flush();
- }
- }
- else if (chunk instanceof EndPortletChunk)
- {
- startPortletChunk = null;
- }
- }
- out.close();
}
}
Deleted:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/Page.java
===================================================================
---
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/Page.java 2008-02-07
22:34:26 UTC (rev 9841)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/Page.java 2008-02-07
23:34:46 UTC (rev 9842)
@@ -1,101 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2008, 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.portlet.test.jsp;
-
-import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
-import org.jboss.portal.portlet.controller.PortletControllerContext;
-import org.jboss.portal.portlet.controller.state.PageNavigationalState;
-import org.jboss.portal.portlet.test.jsp.response.Chunk;
-import org.jboss.portal.portlet.test.jsp.response.portlet.StartPortletChunk;
-
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Collection;
-import java.util.List;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 630 $
- */
-public class Page
-{
-
- /** . */
- private List<Chunk> chunks;
-
- /** . */
- private Map<StartPortletChunk, Window> windows;
-
- public Page(List<Chunk> chunks, Map<StartPortletChunk, Window> windows)
- {
- this.chunks = chunks;
- this.windows = windows;
- }
-
- public Collection<Chunk> getChunks()
- {
- return chunks;
- }
-
- public Window getWindow(Chunk chunk)
- {
- return windows.get(chunk);
- }
-
- public Window getWindow(String windowId)
- {
- for (Window window : windows.values())
- {
- if (window.getId().equals(windowId))
- {
- return window;
- }
- }
- return null;
- }
-
- public Collection<Window> getWindows()
- {
- return windows.values();
- }
-
- public Map<String, PortletInvocationResponse> render(PortletControllerContext
context, PageNavigationalState pageState)
- {
- Map<String, PortletInvocationResponse> responses = new HashMap<String,
PortletInvocationResponse>();
-
- //
- for (Window window : windows.values())
- {
- PortletInvocationResponse response = window.render(context, pageState);
-
- //
- if (response != null)
- {
- responses.put(window.getId(), response);
- }
- }
-
- //
- return responses;
- }
-}
Deleted:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/Window.java
===================================================================
---
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/Window.java 2008-02-07
22:34:26 UTC (rev 9841)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/Window.java 2008-02-07
23:34:46 UTC (rev 9842)
@@ -1,137 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2008, 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.portlet.test.jsp;
-
-import org.jboss.portal.portlet.Portlet;
-import org.jboss.portal.portlet.StateString;
-import org.jboss.portal.portlet.PortletInvokerException;
-import org.jboss.portal.portlet.test.controller.TestInstanceContext;
-import org.jboss.portal.portlet.test.controller.TestPortalContext;
-import org.jboss.portal.portlet.impl.spi.AbstractClientContext;
-import org.jboss.portal.portlet.impl.spi.AbstractServerContext;
-import org.jboss.portal.portlet.impl.spi.AbstractUserContext;
-import org.jboss.portal.portlet.impl.spi.AbstractWindowContext;
-import org.jboss.portal.portlet.impl.spi.AbstractSecurityContext;
-import org.jboss.portal.portlet.spi.PortletInvocationContext;
-import org.jboss.portal.portlet.controller.PortletControllerContext;
-import org.jboss.portal.portlet.controller.state.WindowNavigationalState;
-import org.jboss.portal.portlet.controller.state.PageNavigationalState;
-import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
-import org.jboss.portal.portlet.invocation.RenderInvocation;
-import org.jboss.portal.Mode;
-import org.jboss.portal.WindowState;
-import org.jboss.portal.common.util.ParameterMap;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 630 $
- */
-public class Window
-{
-
- /** . */
- private final String id;
-
- /** . */
- private final Portlet portlet;
-
- public Window(String id, Portlet portlet)
- {
- this.id = id;
- this.portlet = portlet;
- }
-
- public String getId()
- {
- return id;
- }
-
- public Portlet getPortlet()
- {
- return portlet;
- }
-
- public PortletInvocationResponse render(
- PortletControllerContext context,
- PageNavigationalState pageState)
- {
- WindowNavigationalState windowNS = pageState.getWindowNavigationalState(id);
-
- //
- Mode mode = Mode.VIEW;
- WindowState windowState = WindowState.NORMAL;
- StateString portletNS = null;
-
- //
- if (windowNS != null)
- {
- if (windowNS.getMode() != null)
- {
- mode = windowNS.getMode();
- }
- if (windowNS.getWindowState() != null)
- {
- windowState = windowNS.getWindowState();
- }
- if (windowNS.getPortletNavigationalState() != null)
- {
- portletNS = windowNS.getPortletNavigationalState();
- }
- }
-
- //
- ParameterMap publicNS = pageState.getPublicNavigationalState(id);
-
- //
- PortletInvocationContext renderContext = context.createPortletInvocationContext(id,
pageState);
- RenderInvocation render = new RenderInvocation(renderContext);
- render.setClientContext(new AbstractClientContext(context.getClientRequest()));
- render.setServerContext(new AbstractServerContext(context.getClientRequest(),
context.getClientResponse()));
- render.setInstanceContext(new TestInstanceContext(context.getClientRequest(),
portlet.getContext(), false));
- render.setUserContext(new AbstractUserContext(context.getClientRequest()));
- render.setWindowContext(new AbstractWindowContext(id));
- render.setPortalContext(new TestPortalContext());
- render.setSecurityContext(new
AbstractSecurityContext(context.getClientRequest()));
- render.setTarget(portlet.getContext());
- render.setMode(mode);
- render.setWindowState(windowState);
- render.setNavigationalState(portletNS);
- render.setPublicNavigationalState(publicNS);
-
- //
- try
- {
- return ((PagePortletControllerContext)context).invoke(render);
-
- }
- catch (PortletInvokerException e)
- {
- e.printStackTrace();
-
- // todo
-
- //
- return null;
- }
- }
-}
Modified:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/BufferingResponse.java
===================================================================
---
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/BufferingResponse.java 2008-02-07
22:34:26 UTC (rev 9841)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/BufferingResponse.java 2008-02-07
23:34:46 UTC (rev 9842)
@@ -22,16 +22,13 @@
******************************************************************************/
package org.jboss.portal.portlet.test.jsp.response;
-import org.jboss.portal.portlet.test.jsp.response.ResponseBuffer;
-import org.jboss.portal.portlet.test.jsp.response.Chunk;
import org.jboss.portal.portlet.test.jsp.PagePortletControllerContext;
import org.jboss.portal.portlet.controller.state.PageNavigationalState;
+import org.jboss.portal.portlet.controller.state.WindowNavigationalState;
+import org.jboss.portal.WindowState;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
-import javax.servlet.ServletOutputStream;
-import java.io.IOException;
-import java.io.PrintWriter;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -41,7 +38,7 @@
{
/** . */
- private final ResponseBuffer buffer = new ResponseBuffer();
+// private final ResponseBuffer buffer = new ResponseBuffer();
/** . */
private final PagePortletControllerContext portletControllerContext;
@@ -64,36 +61,83 @@
this.pageState = pageState;
}
+ /**
+ * The page state for the rendering.
+ *
+ * @return the page state
+ */
public PageNavigationalState getPageState()
{
return pageState;
}
- public PagePortletControllerContext getPortletControllerContext()
+ public String getMaximizedWindowId()
{
- return portletControllerContext;
- }
+ if (pageState != null)
+ {
+ for (String windowId : pageState.getWindowIds())
+ {
+ WindowNavigationalState windowNS =
pageState.getWindowNavigationalState(windowId);
+ if (WindowState.MAXIMIZED.equals(windowNS.getWindowState()))
+ {
+ return windowId;
+ }
+ }
+ }
- public ResponseBuffer getBuffer()
- {
- return buffer;
+ //
+ return null;
}
- public ServletOutputStream getOutputStream() throws IOException
+ public boolean isRenderable(String windowId)
{
- return buffer.getOutputStream();
- }
+ if (windowId == null)
+ {
+ throw new IllegalArgumentException();
+ }
- public PrintWriter getWriter() throws IOException
- {
- return buffer.getWriter();
+ //
+ if (pageState == null)
+ {
+ return false;
+ }
+
+ //
+ String maximizedWindowId = getMaximizedWindowId();
+ if (maximizedWindowId != null)
+ {
+ return maximizedWindowId.equals(windowId);
+ }
+
+ //
+ return true;
}
- public void close()
+ public PagePortletControllerContext getPortletControllerContext()
{
- buffer.close();
+ return portletControllerContext;
}
+// public ResponseBuffer getBuffer()
+// {
+// return buffer;
+// }
+//
+// public ServletOutputStream getOutputStream() throws IOException
+// {
+// return buffer.getOutputStream();
+// }
+//
+// public PrintWriter getWriter() throws IOException
+// {
+// return buffer.getWriter();
+// }
+//
+// public void close()
+// {
+// buffer.close();
+// }
+
public String nextId()
{
return "" + count++;
Deleted:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/BytesChunk.java
===================================================================
---
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/BytesChunk.java 2008-02-07
22:34:26 UTC (rev 9841)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/BytesChunk.java 2008-02-07
23:34:46 UTC (rev 9842)
@@ -1,44 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2008, 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.portlet.test.jsp.response;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 630 $
- */
-public class BytesChunk extends Chunk
-{
-
- /** . */
- private final byte[] bytes;
-
- public BytesChunk(byte[] bytes)
- {
- this.bytes = bytes;
- }
-
- public byte[] getBytes()
- {
- return bytes;
- }
-}
Deleted:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/CharsChunk.java
===================================================================
---
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/CharsChunk.java 2008-02-07
22:34:26 UTC (rev 9841)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/CharsChunk.java 2008-02-07
23:34:46 UTC (rev 9842)
@@ -1,44 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2008, 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.portlet.test.jsp.response;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 630 $
- */
-public class CharsChunk extends Chunk
-{
-
- /** . */
- private final char[] chars;
-
- public CharsChunk(char[] chars)
- {
- this.chars = chars;
- }
-
- public char[] getChars()
- {
- return chars;
- }
-}
Deleted:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/Chunk.java
===================================================================
---
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/Chunk.java 2008-02-07
22:34:26 UTC (rev 9841)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/Chunk.java 2008-02-07
23:34:46 UTC (rev 9842)
@@ -1,34 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2008, 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.portlet.test.jsp.response;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 630 $
- */
-public class Chunk
-{
-
-
-
-}
Deleted:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/EndPageChunk.java
===================================================================
---
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/EndPageChunk.java 2008-02-07
22:34:26 UTC (rev 9841)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/EndPageChunk.java 2008-02-07
23:34:46 UTC (rev 9842)
@@ -1,33 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2008, 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.portlet.test.jsp.response;
-
-import org.jboss.portal.portlet.test.jsp.response.Chunk;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 630 $
- */
-public class EndPageChunk extends Chunk
-{
-}
Deleted:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/ResponseBuffer.java
===================================================================
---
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/ResponseBuffer.java 2008-02-07
22:34:26 UTC (rev 9841)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/ResponseBuffer.java 2008-02-07
23:34:46 UTC (rev 9842)
@@ -1,216 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2008, 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.portlet.test.jsp.response;
-
-import javax.servlet.ServletOutputStream;
-import java.io.IOException;
-import java.io.ByteArrayOutputStream;
-import java.io.StringWriter;
-import java.io.PrintWriter;
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 630 $
- */
-public class ResponseBuffer
-{
-
- /** . */
- private final List<Chunk> chunks = new LinkedList<Chunk>();
-
- /** . */
- private ChunkOutputStream chunkOutputStream;
-
- /** . */
- private ChunkWriter chunkWriter;
-
- /** . */
- private PrintWriter writer;
-
- /** . */
- private boolean muted;
-
- public boolean isMuted()
- {
- return muted;
- }
-
- public void setMuted(boolean muted)
- {
- this.muted = muted;
- }
-
- public List<Chunk> getChunks()
- {
- return chunks;
- }
-
- public void flush()
- {
- if (chunkWriter != null)
- {
- chunkWriter.writeChunk();
- }
- else if (chunkOutputStream != null)
- {
- chunkOutputStream.writeChunk();
- }
- }
-
- public void close()
- {
- try
- {
- if (chunkWriter != null)
- {
- chunkWriter.close();
- }
- else if (chunkOutputStream != null)
- {
- chunkOutputStream.close();
- }
- }
- catch (IOException e)
- {
- e.printStackTrace();
- }
- }
-
- public ServletOutputStream getOutputStream()
- {
- if (chunkOutputStream == null)
- {
- if (writer != null)
- {
- throw new IllegalStateException();
- }
-
- //
- chunkOutputStream = new ChunkOutputStream();
- }
-
- //
- return chunkOutputStream;
- }
-
- public PrintWriter getWriter()
- {
- if (chunkWriter == null)
- {
- if (chunkOutputStream != null)
- {
- throw new IllegalStateException();
- }
-
- //
- chunkWriter = new ChunkWriter();
- writer = new PrintWriter(chunkWriter);
- }
-
- //
- return writer;
- }
-
- public void addChunk(Chunk chunk)
- {
- if (chunkWriter != null)
- {
- chunkWriter.writeChunk();
- }
- else if (chunkOutputStream != null)
- {
- chunkOutputStream.writeChunk();
- }
-
- //
- chunks.add(chunk);
- }
-
- private class ChunkWriter extends StringWriter
- {
-
- public void writeChunk()
- {
- StringBuffer sb = getBuffer();
- if (sb.length() > 0)
- {
- if (!muted)
- {
- char[] chars = new char[sb.length()];
- sb.getChars(0, sb.length(), chars, 0);
- CharsChunk chunk = new CharsChunk(chars);
- chunks.add(chunk);
- }
-
- //
- sb.setLength(0);
- }
- }
-
- public void close() throws IOException
- {
- super.close();
-
- //
- writeChunk();
- }
- }
-
- private class ChunkOutputStream extends ServletOutputStream
- {
-
- /** . */
- private final ByteArrayOutputStream bytebuffer = new ByteArrayOutputStream();
-
- public void write(int b) throws IOException
- {
- bytebuffer.write(b);
- }
-
- public void writeChunk()
- {
- if (bytebuffer.size() > 0 && !muted)
- {
- if (!muted)
- {
- byte[] bytes = bytebuffer.toByteArray();
- BytesChunk chunk = new BytesChunk(bytes);
- chunks.add(chunk);
- }
-
- //
- bytebuffer.reset();
- }
- }
-
- public void close() throws IOException
- {
- super.close();
-
- //
- writeChunk();
- }
- }
-}
Deleted:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/StartPageChunk.java
===================================================================
---
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/StartPageChunk.java 2008-02-07
22:34:26 UTC (rev 9841)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/StartPageChunk.java 2008-02-07
23:34:46 UTC (rev 9842)
@@ -1,33 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2008, 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.portlet.test.jsp.response;
-
-import org.jboss.portal.portlet.test.jsp.response.Chunk;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 630 $
- */
-public class StartPageChunk extends Chunk
-{
-}
Deleted:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/portlet/EndPortletChunk.java
===================================================================
---
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/portlet/EndPortletChunk.java 2008-02-07
22:34:26 UTC (rev 9841)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/portlet/EndPortletChunk.java 2008-02-07
23:34:46 UTC (rev 9842)
@@ -1,33 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2008, 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.portlet.test.jsp.response.portlet;
-
-import org.jboss.portal.portlet.test.jsp.response.Chunk;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 630 $
- */
-public class EndPortletChunk extends Chunk
-{
-}
Deleted:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/portlet/PortletMarkupChunk.java
===================================================================
---
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/portlet/PortletMarkupChunk.java 2008-02-07
22:34:26 UTC (rev 9841)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/portlet/PortletMarkupChunk.java 2008-02-07
23:34:46 UTC (rev 9842)
@@ -1,33 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2008, 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.portlet.test.jsp.response.portlet;
-
-import org.jboss.portal.portlet.test.jsp.response.Chunk;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 630 $
- */
-public class PortletMarkupChunk extends Chunk
-{
-}
Deleted:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/portlet/PortletURLChunk.java
===================================================================
---
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/portlet/PortletURLChunk.java 2008-02-07
22:34:26 UTC (rev 9841)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/portlet/PortletURLChunk.java 2008-02-07
23:34:46 UTC (rev 9842)
@@ -1,68 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2008, 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.portlet.test.jsp.response.portlet;
-
-import org.jboss.portal.portlet.test.jsp.response.Chunk;
-import org.jboss.portal.Mode;
-import org.jboss.portal.WindowState;
-
-import java.util.Map;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 630 $
- */
-public class PortletURLChunk extends Chunk
-{
-
- /** . */
- private final Mode mode;
-
- /** . */
- private final WindowState windowState;
-
- /** . */
- private final Map<String, String[]> params;
-
- public PortletURLChunk(Mode mode, WindowState windowState, Map<String, String[]>
params)
- {
- this.mode = mode;
- this.windowState = windowState;
- this.params = params;
- }
-
- public Mode getMode()
- {
- return mode;
- }
-
- public WindowState getWindowState()
- {
- return windowState;
- }
-
- public Map<String, String[]> getParams()
- {
- return params;
- }
-}
Modified:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/portlet/StartPortletChunk.java
===================================================================
---
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/portlet/StartPortletChunk.java 2008-02-07
22:34:26 UTC (rev 9841)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/portlet/StartPortletChunk.java 2008-02-07
23:34:46 UTC (rev 9842)
@@ -24,7 +24,6 @@
import org.jboss.portal.Mode;
import org.jboss.portal.WindowState;
-import org.jboss.portal.portlet.test.jsp.response.Chunk;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
import java.util.Set;
@@ -33,7 +32,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 630 $
*/
-public class StartPortletChunk extends Chunk
+public class StartPortletChunk
{
/** . */
Deleted:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/portlet/StartPortletTitleChunk.java
===================================================================
---
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/portlet/StartPortletTitleChunk.java 2008-02-07
22:34:26 UTC (rev 9841)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/portlet/StartPortletTitleChunk.java 2008-02-07
23:34:46 UTC (rev 9842)
@@ -1,33 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2008, 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.portlet.test.jsp.response.portlet;
-
-import org.jboss.portal.portlet.test.jsp.response.Chunk;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 630 $
- */
-public class StartPortletTitleChunk extends Chunk
-{
-}
Modified:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/AbstractURLTag.java
===================================================================
---
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/AbstractURLTag.java 2008-02-07
22:34:26 UTC (rev 9841)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/AbstractURLTag.java 2008-02-07
23:34:46 UTC (rev 9842)
@@ -23,6 +23,7 @@
package org.jboss.portal.portlet.test.jsp.taglib;
import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.BodyTagSupport;
import java.util.Map;
import java.util.HashMap;
@@ -30,22 +31,17 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 630 $
*/
-public class AbstractURLTag extends BodyChunkTagSupport
+public class AbstractURLTag extends BodyTagSupport
{
/** . */
- private Map<String, String[]> params = new HashMap<String, String[]>();
+ protected Map<String, String[]> params = new HashMap<String, String[]>();
public void setParam(String name, String value)
{
params.put(name, new String[]{value});
}
- public Map<String, String[]> getParams()
- {
- return new HashMap<String, String[]>(params);
- }
-
public void doInitBody() throws JspException
{
params.clear();
Deleted:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/BodyChunkTagSupport.java
===================================================================
---
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/BodyChunkTagSupport.java 2008-02-07
22:34:26 UTC (rev 9841)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/BodyChunkTagSupport.java 2008-02-07
23:34:46 UTC (rev 9842)
@@ -1,75 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2008, 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.portlet.test.jsp.taglib;
-
-import org.jboss.portal.portlet.test.jsp.response.BufferingResponse;
-import org.jboss.portal.portlet.test.jsp.response.Chunk;
-import org.jboss.portal.portlet.test.jsp.response.ResponseBuffer;
-
-import javax.servlet.jsp.tagext.BodyTagSupport;
-import javax.servlet.jsp.JspException;
-import java.io.IOException;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 630 $
- */
-public class BodyChunkTagSupport extends BodyTagSupport
-{
-
- protected final ResponseBuffer getBuffer()
- {
- BufferingResponse response = (BufferingResponse)pageContext.getResponse();
- return response.getBuffer();
- }
-
- protected void mute(boolean on) throws JspException
- {
- try
- {
- pageContext.getOut().flush();
- BufferingResponse response = (BufferingResponse)pageContext.getResponse();
- ResponseBuffer buffer = response.getBuffer();
- buffer.flush();
- buffer.setMuted(on);
- }
- catch (IOException e)
- {
- throw new JspException(e);
- }
- }
-
- protected final void addChunk(Chunk chunk) throws JspException
- {
- try
- {
- pageContext.getOut().flush();
- BufferingResponse response = (BufferingResponse)pageContext.getResponse();
- response.getBuffer().addChunk(chunk);
- }
- catch (IOException e)
- {
- throw new JspException(e);
- }
- }
-}
Modified:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PageTag.java
===================================================================
---
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PageTag.java 2008-02-07
22:34:26 UTC (rev 9841)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PageTag.java 2008-02-07
23:34:46 UTC (rev 9842)
@@ -22,30 +22,24 @@
******************************************************************************/
package org.jboss.portal.portlet.test.jsp.taglib;
-import org.jboss.portal.portlet.test.jsp.response.StartPageChunk;
-import org.jboss.portal.portlet.test.jsp.response.EndPageChunk;
-
import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.BodyTagSupport;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 630 $
*/
-public class PageTag extends BodyChunkTagSupport
+public class PageTag extends BodyTagSupport
{
public int doStartTag() throws JspException
{
- addChunk(new StartPageChunk());
-
//
return EVAL_BODY_INCLUDE;
}
public int doEndTag() throws JspException
{
- addChunk(new EndPageChunk());
-
//
return EVAL_PAGE;
}
Added:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortalSimpleTagSupport.java
===================================================================
---
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortalSimpleTagSupport.java
(rev 0)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortalSimpleTagSupport.java 2008-02-07
23:34:46 UTC (rev 9842)
@@ -0,0 +1,41 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, 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.portlet.test.jsp.taglib;
+
+import org.jboss.portal.portlet.test.jsp.response.BufferingResponse;
+
+import javax.servlet.jsp.tagext.SimpleTagSupport;
+import javax.servlet.jsp.PageContext;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class PortalSimpleTagSupport extends SimpleTagSupport
+{
+ protected final BufferingResponse getPortalResponse()
+ {
+ PageContext pageContext = (PageContext)getJspContext();
+ return (BufferingResponse)pageContext.getResponse();
+ }
+}
Modified:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletMarkupTag.java
===================================================================
---
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletMarkupTag.java 2008-02-07
22:34:26 UTC (rev 9841)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletMarkupTag.java 2008-02-07
23:34:46 UTC (rev 9842)
@@ -22,17 +22,72 @@
******************************************************************************/
package org.jboss.portal.portlet.test.jsp.taglib;
-import org.jboss.portal.portlet.test.jsp.response.Chunk;
-import org.jboss.portal.portlet.test.jsp.response.portlet.PortletMarkupChunk;
+import org.jboss.portal.portlet.test.jsp.response.BufferingResponse;
+import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
+import org.jboss.portal.portlet.invocation.response.FragmentResponse;
+import org.jboss.portal.portlet.controller.state.WindowNavigationalState;
+import org.jboss.portal.WindowState;
+import javax.servlet.jsp.tagext.SimpleTagSupport;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+import java.io.IOException;
+
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 630 $
*/
-public class PortletMarkupTag extends SimpleChunkTagSupport
+public class PortletMarkupTag extends PortalSimpleTagSupport
{
- protected Chunk doChunkTag()
+ public void doTag() throws JspException, IOException
{
- return new PortletMarkupChunk();
+
+ BufferingResponse resp = getPortalResponse();
+
+ PortletTag portletTag = (PortletTag)SimpleTagSupport.findAncestorWithClass(this,
PortletTag.class);
+
+ PortletInvocationResponse portletResp = portletTag.chunk.getResponse();
+
+ JspWriter out = getJspContext().getOut();
+
+ if (portletResp != null)
+ {
+ if (portletResp instanceof FragmentResponse)
+ {
+ FragmentResponse fragment = (FragmentResponse)portletResp;
+ WindowNavigationalState windowNS = null;
+ if (resp.getPageState() != null)
+ {
+ windowNS =
resp.getPageState().getWindowNavigationalState(portletTag.chunk.getWindowId());
+ }
+ if (windowNS == null ||
!windowNS.getWindowState().equals(WindowState.MINIMIZED))
+ {
+ if (fragment.getType() != FragmentResponse.TYPE_EMPTY)
+ {
+ String frag;
+ if (fragment.getType() == FragmentResponse.TYPE_BYTES)
+ {
+ frag = fragment.getBytes().toString();
+ }
+ else
+ {
+ frag = fragment.getChars().toString();
+ }
+
+ out.write(frag);
+ }
+ }
+ }
+ else
+ {
+ out.write(portletResp.getClass().getSimpleName() + "[" +
portletTag.chunk.getPortletName() + "," + portletTag.chunk.getApplicationName()
+ "]");
+ out.flush();
+ }
+ }
+ else
+ {
+ out.write("Empty[" + portletTag.chunk.getPortletName() + ","
+ portletTag.chunk.getApplicationName() + "]");
+ out.flush();
+ }
}
}
Modified:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletTag.java
===================================================================
---
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletTag.java 2008-02-07
22:34:26 UTC (rev 9841)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletTag.java 2008-02-07
23:34:46 UTC (rev 9842)
@@ -23,7 +23,6 @@
package org.jboss.portal.portlet.test.jsp.taglib;
import org.jboss.portal.portlet.test.jsp.response.portlet.StartPortletChunk;
-import org.jboss.portal.portlet.test.jsp.response.portlet.EndPortletChunk;
import org.jboss.portal.portlet.test.jsp.response.BufferingResponse;
import org.jboss.portal.portlet.test.jsp.PagePortletControllerContext;
import org.jboss.portal.portlet.test.controller.TestInstanceContext;
@@ -47,7 +46,7 @@
import org.jboss.portal.common.util.ParameterMap;
import javax.servlet.jsp.JspException;
-import java.io.IOException;
+import javax.servlet.jsp.tagext.BodyTagSupport;
import java.util.LinkedHashSet;
import java.util.Set;
import java.util.Collections;
@@ -56,7 +55,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 630 $
*/
-public class PortletTag extends BodyChunkTagSupport
+public class PortletTag extends BodyTagSupport
{
/** . */
@@ -130,35 +129,21 @@
this.initialModeValue = initialMode;
}
+ StartPortletChunk chunk;
+
public int doStartTag() throws JspException
{
-
- //
BufferingResponse response = (BufferingResponse)pageContext.getResponse();
- StartPortletChunk chunk = render(response);
-
+
//
- try
- {
- pageContext.getOut().flush();
- }
- catch (IOException e)
- {
- throw new JspException(e);
- }
+ chunk = render(response);
//
- addChunk(chunk);
-
- //
return EVAL_BODY_INCLUDE;
}
public int doEndTag() throws JspException
{
- addChunk(new EndPortletChunk());
-
- //
return EVAL_PAGE;
}
Modified:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletTitleTag.java
===================================================================
---
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletTitleTag.java 2008-02-07
22:34:26 UTC (rev 9841)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletTitleTag.java 2008-02-07
23:34:46 UTC (rev 9842)
@@ -22,17 +22,34 @@
******************************************************************************/
package org.jboss.portal.portlet.test.jsp.taglib;
-import org.jboss.portal.portlet.test.jsp.response.Chunk;
-import org.jboss.portal.portlet.test.jsp.response.portlet.StartPortletTitleChunk;
+import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
+import org.jboss.portal.portlet.invocation.response.FragmentResponse;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.tagext.SimpleTagSupport;
+import java.io.IOException;
+
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 630 $
*/
-public class PortletTitleTag extends SimpleChunkTagSupport
+public class PortletTitleTag extends PortalSimpleTagSupport
{
- protected Chunk doChunkTag()
+
+ public void doTag() throws JspException, IOException
{
- return new StartPortletTitleChunk();
+
+ PortletTag portletTag = (PortletTag)SimpleTagSupport.findAncestorWithClass(this,
PortletTag.class);
+
+ PortletInvocationResponse portletResp = portletTag.chunk.getResponse();
+
+ JspWriter out = getJspContext().getOut();
+
+ if (portletResp instanceof FragmentResponse)
+ {
+ FragmentResponse fragment = (FragmentResponse)portletResp;
+ out.write(fragment.getTitle());
+ }
}
}
Modified:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletURLTag.java
===================================================================
---
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletURLTag.java 2008-02-07
22:34:26 UTC (rev 9841)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletURLTag.java 2008-02-07
23:34:46 UTC (rev 9842)
@@ -24,9 +24,19 @@
import org.jboss.portal.Mode;
import org.jboss.portal.WindowState;
-import org.jboss.portal.portlet.test.jsp.response.portlet.PortletURLChunk;
+import org.jboss.portal.portlet.test.jsp.response.BufferingResponse;
+import org.jboss.portal.portlet.test.jsp.PagePortletControllerContext;
+import org.jboss.portal.portlet.test.controller.PortletURLRenderer;
+import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
+import org.jboss.portal.portlet.controller.impl.state.StateControllerContextImpl;
+import org.jboss.portal.portlet.RenderURL;
+import org.jboss.portal.portlet.StateString;
import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.tagext.SimpleTagSupport;
+import java.util.Map;
+import java.io.IOException;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -63,20 +73,24 @@
public int doStartTag() throws JspException
{
- mute(true);
-
- //
return EVAL_BODY_BUFFERED;
}
public int doEndTag() throws JspException
{
+ BufferingResponse response = (BufferingResponse)pageContext.getResponse();
+ PagePortletControllerContext context = response.getPortletControllerContext();
+ PortletTag portletTag = (PortletTag)SimpleTagSupport.findAncestorWithClass(this,
PortletTag.class);
+
Mode mode = null;
if (modeValue != null)
{
mode = Mode.create(modeValue.trim());
}
+ PortletInvocationResponse portletResp = portletTag.chunk.getResponse();
+
+
//
WindowState windowState = null;
if (windowStateValue != null)
@@ -84,13 +98,53 @@
windowState = WindowState.create(windowStateValue.trim());
}
- //
- addChunk(new PortletURLChunk(mode, windowState, getParams()));
+ PortletURLRenderer renderer = new PortletURLRenderer(
+ (StateControllerContextImpl)context.getStateControllerContext(),
+ response.getPageState(),
+ context.getClientRequest(),
+ context.getClientResponse());
- //
- mute(false);
+ final WindowState ws = windowState;
+ final Mode md = mode;
+ RenderURL url = new RenderURL()
+ {
+
+
+ public StateString getNavigationalState()
+ {
+ return null;
+ }
+
+ public Map<String, String[]> getPublicNavigationalStateChanges()
+ {
+ return params;
+ }
+
+ public Mode getMode()
+ {
+ return md;
+ }
+
+ public WindowState getWindowState()
+ {
+ return ws;
+ }
+ };
+
+ try
+ {
+ JspWriter out = pageContext.getOut();
+ String renderedURL = renderer.renderURL(portletTag.chunk.getWindowId(), url,
null, null, true);
+ out.write(renderedURL);
+ }
+ catch (IOException e)
+ {
+ throw new JspException(e);
+ }
+
//
return EVAL_PAGE;
}
+
}
Deleted:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/SimpleChunkTagSupport.java
===================================================================
---
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/SimpleChunkTagSupport.java 2008-02-07
22:34:26 UTC (rev 9841)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/SimpleChunkTagSupport.java 2008-02-07
23:34:46 UTC (rev 9842)
@@ -1,56 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2008, 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.portlet.test.jsp.taglib;
-
-import org.jboss.portal.portlet.test.jsp.response.Chunk;
-import org.jboss.portal.portlet.test.jsp.response.BufferingResponse;
-
-import javax.servlet.jsp.tagext.SimpleTagSupport;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import java.io.IOException;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 630 $
- */
-public abstract class SimpleChunkTagSupport extends SimpleTagSupport
-{
-
- public final void doTag() throws JspException, IOException
- {
- Chunk chunk = doChunkTag();
-
- //
- if (chunk != null)
- {
- PageContext pageCtx = (PageContext)getJspContext();
- pageCtx.getOut().flush();
- BufferingResponse response = (BufferingResponse)pageCtx.getResponse();
- response.getBuffer().addChunk(chunk);
- }
- }
-
- protected abstract Chunk doChunkTag();
-
-}