Author: julien(a)jboss.com
Date: 2008-02-07 18:42:16 -0500 (Thu, 07 Feb 2008)
New Revision: 9843
Added:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/PortalResponse.java
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletResult.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/taglib/PortalSimpleTagSupport.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:
rename old classes to new classes (concepts)
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
23:34:46 UTC (rev 9842)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/ControllerFilter.java 2008-02-07
23:42:16 UTC (rev 9843)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.portlet.test.jsp;
-import org.jboss.portal.portlet.test.jsp.response.BufferingResponse;
+import org.jboss.portal.portlet.test.jsp.PortalResponse;
import org.jboss.portal.portlet.test.controller.PortletURLRenderer;
import org.jboss.portal.portlet.PortletInvoker;
import org.jboss.portal.portlet.PortletInvokerException;
@@ -207,10 +207,10 @@
}
//
- BufferingResponse bufferingResponse = new BufferingResponse(resp, context,
pageState);
+ PortalResponse portalResponse = new PortalResponse(resp, context, pageState);
//
- chain.doFilter(req, bufferingResponse);
+ chain.doFilter(req, portalResponse);
}
public void destroy()
@@ -218,7 +218,7 @@
this.config = null;
}
- protected void render(HttpServletRequest req, BufferingResponse resp) throws
ServletException, IOException, ClassNotFoundException
+ protected void render(HttpServletRequest req, PortalResponse resp) throws
ServletException, IOException, ClassNotFoundException
{
//
Copied:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/PortalResponse.java
(from rev 9842,
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/PortalResponse.java
(rev 0)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/PortalResponse.java 2008-02-07
23:42:16 UTC (rev 9843)
@@ -0,0 +1,145 @@
+/******************************************************************************
+ * 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.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;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class PortalResponse extends HttpServletResponseWrapper
+{
+
+ /** . */
+// private final ResponseBuffer buffer = new ResponseBuffer();
+
+ /** . */
+ private final PagePortletControllerContext portletControllerContext;
+
+ /** . */
+ private final PageNavigationalState pageState;
+
+ /** . */
+ private int count = 0;
+
+ public PortalResponse(
+ HttpServletResponse response,
+ PagePortletControllerContext portletControllerContext,
+ PageNavigationalState pageState)
+ {
+ super(response);
+
+ //
+ this.portletControllerContext = portletControllerContext;
+ this.pageState = pageState;
+ }
+
+ /**
+ * The page state for the rendering.
+ *
+ * @return the page state
+ */
+ public PageNavigationalState getPageState()
+ {
+ return pageState;
+ }
+
+ public String getMaximizedWindowId()
+ {
+ if (pageState != null)
+ {
+ for (String windowId : pageState.getWindowIds())
+ {
+ WindowNavigationalState windowNS =
pageState.getWindowNavigationalState(windowId);
+ if (WindowState.MAXIMIZED.equals(windowNS.getWindowState()))
+ {
+ return windowId;
+ }
+ }
+ }
+
+ //
+ return null;
+ }
+
+ public boolean isRenderable(String windowId)
+ {
+ if (windowId == null)
+ {
+ throw new IllegalArgumentException();
+ }
+
+ //
+ if (pageState == null)
+ {
+ return false;
+ }
+
+ //
+ String maximizedWindowId = getMaximizedWindowId();
+ if (maximizedWindowId != null)
+ {
+ return maximizedWindowId.equals(windowId);
+ }
+
+ //
+ return true;
+ }
+
+ public PagePortletControllerContext getPortletControllerContext()
+ {
+ 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++;
+ }
+}
Modified:
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 2008-02-07
23:34:46 UTC (rev 9842)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortalSimpleTagSupport.java 2008-02-07
23:42:16 UTC (rev 9843)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.portlet.test.jsp.taglib;
-import org.jboss.portal.portlet.test.jsp.response.BufferingResponse;
+import org.jboss.portal.portlet.test.jsp.PortalResponse;
import javax.servlet.jsp.tagext.SimpleTagSupport;
import javax.servlet.jsp.PageContext;
@@ -33,9 +33,9 @@
*/
public class PortalSimpleTagSupport extends SimpleTagSupport
{
- protected final BufferingResponse getPortalResponse()
+ protected final PortalResponse getPortalResponse()
{
PageContext pageContext = (PageContext)getJspContext();
- return (BufferingResponse)pageContext.getResponse();
+ return (PortalResponse)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
23:34:46 UTC (rev 9842)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletMarkupTag.java 2008-02-07
23:42:16 UTC (rev 9843)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.portlet.test.jsp.taglib;
-import org.jboss.portal.portlet.test.jsp.response.BufferingResponse;
+import org.jboss.portal.portlet.test.jsp.PortalResponse;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
import org.jboss.portal.portlet.invocation.response.FragmentResponse;
import org.jboss.portal.portlet.controller.state.WindowNavigationalState;
@@ -42,11 +42,11 @@
public void doTag() throws JspException, IOException
{
- BufferingResponse resp = getPortalResponse();
+ PortalResponse resp = getPortalResponse();
PortletTag portletTag = (PortletTag)SimpleTagSupport.findAncestorWithClass(this,
PortletTag.class);
- PortletInvocationResponse portletResp = portletTag.chunk.getResponse();
+ PortletInvocationResponse portletResp = portletTag.result.getResponse();
JspWriter out = getJspContext().getOut();
@@ -58,7 +58,7 @@
WindowNavigationalState windowNS = null;
if (resp.getPageState() != null)
{
- windowNS =
resp.getPageState().getWindowNavigationalState(portletTag.chunk.getWindowId());
+ windowNS =
resp.getPageState().getWindowNavigationalState(portletTag.result.getWindowId());
}
if (windowNS == null ||
!windowNS.getWindowState().equals(WindowState.MINIMIZED))
{
@@ -80,13 +80,13 @@
}
else
{
- out.write(portletResp.getClass().getSimpleName() + "[" +
portletTag.chunk.getPortletName() + "," + portletTag.chunk.getApplicationName()
+ "]");
+ out.write(portletResp.getClass().getSimpleName() + "[" +
portletTag.result.getPortletName() + "," +
portletTag.result.getApplicationName() + "]");
out.flush();
}
}
else
{
- out.write("Empty[" + portletTag.chunk.getPortletName() + ","
+ portletTag.chunk.getApplicationName() + "]");
+ out.write("Empty[" + portletTag.result.getPortletName() +
"," + portletTag.result.getApplicationName() + "]");
out.flush();
}
}
Copied:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletResult.java
(from rev 9842,
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/PortletResult.java
(rev 0)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletResult.java 2008-02-07
23:42:16 UTC (rev 9843)
@@ -0,0 +1,114 @@
+/******************************************************************************
+ * 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.Mode;
+import org.jboss.portal.WindowState;
+import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
+
+import java.util.Set;
+
+/**
+ * Combines the invocation of a portlet and the info on the portlet JSP tag. It does
+ * not need to be exposed out of this package.
+ *
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+class PortletResult
+{
+
+ /** . */
+ private final String portletName;
+
+ /** . */
+ private final String applicationName;
+
+ /** . */
+ private final String windowId;
+
+ /** . */
+ private final PortletInvocationResponse response;
+
+ /** . */
+ private final Mode initialMode;
+
+ /** . */
+ private final Set<Mode> supportedModes;
+
+ /** . */
+ private final Set<WindowState> supportedWindowStates;
+
+ public PortletResult(
+ String portletName,
+ String applicationName,
+ String windowId,
+ PortletInvocationResponse response,
+ Mode initialMode,
+ Set<Mode> supportedModes,
+ Set<WindowState> supportedWindowStates)
+ {
+ this.portletName = portletName;
+ this.applicationName = applicationName;
+ this.windowId = windowId;
+ this.response = response;
+ this.initialMode = initialMode;
+ this.supportedModes = supportedModes;
+ this.supportedWindowStates = supportedWindowStates;
+ }
+
+ public String getPortletName()
+ {
+ return portletName;
+ }
+
+ public String getApplicationName()
+ {
+ return applicationName;
+ }
+
+ public String getWindowId()
+ {
+ return windowId;
+ }
+
+ public PortletInvocationResponse getResponse()
+ {
+ return response;
+ }
+
+ public Mode getInitialMode()
+ {
+ return initialMode;
+ }
+
+ public Set<Mode> getSupportedModes()
+ {
+ return supportedModes;
+ }
+
+ public Set<WindowState> getSupportedWindowStates()
+ {
+ return supportedWindowStates;
+ }
+}
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
23:34:46 UTC (rev 9842)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletTag.java 2008-02-07
23:42:16 UTC (rev 9843)
@@ -22,8 +22,8 @@
******************************************************************************/
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.BufferingResponse;
+import org.jboss.portal.portlet.test.jsp.taglib.PortletResult;
+import org.jboss.portal.portlet.test.jsp.PortalResponse;
import org.jboss.portal.portlet.test.jsp.PagePortletControllerContext;
import org.jboss.portal.portlet.test.controller.TestInstanceContext;
import org.jboss.portal.portlet.test.controller.TestPortalContext;
@@ -129,14 +129,14 @@
this.initialModeValue = initialMode;
}
- StartPortletChunk chunk;
+ PortletResult result;
public int doStartTag() throws JspException
{
- BufferingResponse response = (BufferingResponse)pageContext.getResponse();
+ PortalResponse response = (PortalResponse)pageContext.getResponse();
//
- chunk = render(response);
+ result = render(response);
//
return EVAL_BODY_INCLUDE;
@@ -147,7 +147,7 @@
return EVAL_PAGE;
}
- public StartPortletChunk render(BufferingResponse response)
+ public PortletResult render(PortalResponse response)
{
Set<Mode> supportedModes = new LinkedHashSet<Mode>();
if (supportedModeValues != null)
@@ -264,7 +264,7 @@
}
//
- return new StartPortletChunk(
+ return new PortletResult(
name,
applicationName,
windowId,
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
23:34:46 UTC (rev 9842)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletTitleTag.java 2008-02-07
23:42:16 UTC (rev 9843)
@@ -42,7 +42,7 @@
PortletTag portletTag = (PortletTag)SimpleTagSupport.findAncestorWithClass(this,
PortletTag.class);
- PortletInvocationResponse portletResp = portletTag.chunk.getResponse();
+ PortletInvocationResponse portletResp = portletTag.result.getResponse();
JspWriter out = getJspContext().getOut();
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
23:34:46 UTC (rev 9842)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletURLTag.java 2008-02-07
23:42:16 UTC (rev 9843)
@@ -24,7 +24,7 @@
import org.jboss.portal.Mode;
import org.jboss.portal.WindowState;
-import org.jboss.portal.portlet.test.jsp.response.BufferingResponse;
+import org.jboss.portal.portlet.test.jsp.PortalResponse;
import org.jboss.portal.portlet.test.jsp.PagePortletControllerContext;
import org.jboss.portal.portlet.test.controller.PortletURLRenderer;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
@@ -78,7 +78,7 @@
public int doEndTag() throws JspException
{
- BufferingResponse response = (BufferingResponse)pageContext.getResponse();
+ PortalResponse response = (PortalResponse)pageContext.getResponse();
PagePortletControllerContext context = response.getPortletControllerContext();
PortletTag portletTag = (PortletTag)SimpleTagSupport.findAncestorWithClass(this,
PortletTag.class);
@@ -88,9 +88,6 @@
mode = Mode.create(modeValue.trim());
}
- PortletInvocationResponse portletResp = portletTag.chunk.getResponse();
-
-
//
WindowState windowState = null;
if (windowStateValue != null)
@@ -135,7 +132,7 @@
try
{
JspWriter out = pageContext.getOut();
- String renderedURL = renderer.renderURL(portletTag.chunk.getWindowId(), url,
null, null, true);
+ String renderedURL = renderer.renderURL(portletTag.result.getWindowId(), url,
null, null, true);
out.write(renderedURL);
}
catch (IOException e)