Author: julien(a)jboss.com Date: 2008-02-09 21:16:32 -0500 (Sat, 09 Feb 2008) New Revision: 9915 Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/PortalPrepareResponse.java Removed: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/PortalActionResponse.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/PageEventControllerContext.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/PagePortletControllerContext.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PageParamTag.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/ParamTag.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortalBodyTagSupport.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 action -> prepare phase 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-10 01:37:59 UTC (rev 9914) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/ControllerFilter.java 2008-02-10 02:16:32 UTC (rev 9915) @@ -88,13 +88,13 @@ PortletInvoker invoker = (PortletInvoker)getServletContext().getAttribute("ConsumerPortletInvoker"); // - PortalActionResponse actionResponse = new PortalActionResponse(resp, invoker); + PortalPrepareResponse prepareResponse = new PortalPrepareResponse(resp, invoker); // Discover existing portlets on the page (introspection phase) - chain.doFilter(req, actionResponse); + chain.doFilter(req, prepareResponse); // Now we can create a populated context - PagePortletControllerContext context = new PagePortletControllerContext(req, resp, getServletContext(), actionResponse); + PagePortletControllerContext context = new PagePortletControllerContext(req, resp, getServletContext(), prepareResponse); // PageNavigationalState pageState = null; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/PageEventControllerContext.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/PageEventControllerContext.java 2008-02-10 01:37:59 UTC (rev 9914) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/PageEventControllerContext.java 2008-02-10 02:16:32 UTC (rev 9915) @@ -41,11 +41,11 @@ { /** . */ - private final PortalActionResponse actionResponse; + private final PortalPrepareResponse prepareResponse; - public PageEventControllerContext(PortalActionResponse actionResponse) + public PageEventControllerContext(PortalPrepareResponse prepareResponse) { - this.actionResponse = actionResponse; + this.prepareResponse = prepareResponse; } public List<Event> getConsumedEvents(Event producedEvent) @@ -53,9 +53,9 @@ ArrayList<Event> consumedEvents = new ArrayList<Event>(); // - for (String windowId : actionResponse.getWindowIds()) + for (String windowId : prepareResponse.getWindowIds()) { - Portlet portlet = actionResponse.getPortlet(windowId); + Portlet portlet = prepareResponse.getPortlet(windowId); // PortletInfo portletInfo = portlet.getInfo(); Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/PagePortletControllerContext.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/PagePortletControllerContext.java 2008-02-10 01:37:59 UTC (rev 9914) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/PagePortletControllerContext.java 2008-02-10 02:16:32 UTC (rev 9915) @@ -47,30 +47,30 @@ private final EventControllerContext eventControllerContext; /** . */ - private final PortalActionResponse actionResponse; + private final PortalPrepareResponse prepareResponse; public PagePortletControllerContext( HttpServletRequest req, HttpServletResponse resp, ServletContext servletContext, - PortalActionResponse actionResponse) + PortalPrepareResponse prepareResponse) throws IllegalRequestException, IOException, ServletException, PortletInvokerException { super(req, resp, servletContext); // - this.actionResponse = actionResponse; - this.eventControllerContext = new PageEventControllerContext(actionResponse); + this.prepareResponse = prepareResponse; + this.eventControllerContext = new PageEventControllerContext(prepareResponse); } protected Portlet getPortlet(String windowId) throws PortletInvokerException { - return actionResponse.getPortlet(windowId); + return prepareResponse.getPortlet(windowId); } public PortletInvocationResponse invoke(PortletInvocation invocation) throws PortletInvokerException { - return actionResponse.getInvoker().invoke(invocation); + return prepareResponse.getInvoker().invoke(invocation); } public EventControllerContext getEventControllerContext() Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/PortalActionResponse.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/PortalActionResponse.java 2008-02-10 01:37:59 UTC (rev 9914) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/PortalActionResponse.java 2008-02-10 02:16:32 UTC (rev 9915) @@ -1,242 +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.PortletInvoker; -import org.jboss.portal.portlet.PortletInvokerException; - -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.Cookie; -import javax.servlet.ServletOutputStream; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.Writer; -import java.util.Locale; -import java.util.Map; -import java.util.HashMap; -import java.util.Set; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -public class PortalActionResponse extends PortalResponse -{ - - /** . */ - private String contentType; - - /** . */ - private Locale locale; - - /** . */ - private String characterEncoding; - - /** . */ - private int bufferSize; - - /** . */ - private ServletOutputStream outputStream; - - /** . */ - private PrintWriter writer; - - /** . */ - private Map<String, Portlet> windows; - - public PortalActionResponse(HttpServletResponse response, PortletInvoker invoker) throws PortletInvokerException - { - super(response, invoker); - - // - this.windows = new HashMap<String, Portlet>(); - } - - public void addWindow(String windowId, Portlet portlet) - { - windows.put(windowId, portlet); - } - - public Set<String> getWindowIds() - { - return windows.keySet(); - } - - public Portlet getPortlet(String windowId) - { - return windows.get(windowId); - } - - public ServletOutputStream getOutputStream() throws IOException - { - if (writer != null) - { - throw new IllegalStateException(); - } - if (outputStream == null) - { - outputStream = new ServletOutputStream() - { - public void write(int b) throws IOException - { - } - }; - } - return outputStream; - } - - public PrintWriter getWriter() throws IOException - { - if (outputStream != null) - { - throw new IllegalStateException(); - } - if (writer == null) - { - Writer tmp = new Writer() - { - public void write(char cbuf[], int off, int len) throws IOException - { - } - public void flush() throws IOException - { - } - public void close() throws IOException - { - } - }; - writer = new PrintWriter(tmp); - } - return writer; - } - - public void flushBuffer() throws IOException - { - } - - public boolean isCommitted() - { - return false; - } - - public void reset() - { - } - - public void resetBuffer() - { - } - - public void sendError(int i, String s) throws IOException - { - } - - public void sendError(int i) throws IOException - { - } - - public void sendRedirect(String s) throws IOException - { - } - - public void addCookie(Cookie cookie) - { - } - - public void setDateHeader(String s, long l) - { - } - - public void addDateHeader(String s, long l) - { - } - - public void setHeader(String s, String s1) - { - } - - public void addHeader(String s, String s1) - { - } - - public void setContentType(String contentType) - { - this.contentType = contentType; - } - - public void setContentLength(int i) - { - } - - public void setCharacterEncoding(String characterEncoding) - { - this.characterEncoding = characterEncoding; - } - - public void setIntHeader(String s, int i) - { - } - - public void addIntHeader(String s, int i) - { - } - - public void setStatus(int i) - { - } - - public void setStatus(int i, String s) - { - } - - public void setLocale(Locale locale) - { - this.locale = locale; - } - - public String getContentType() - { - return contentType; - } - - public Locale getLocale() - { - return locale; - } - - public String getCharacterEncoding() - { - return characterEncoding; - } - - public void setBufferSize(int bufferSize) - { - this.bufferSize = bufferSize; - } - - public int getBufferSize() - { - return bufferSize; - } -} Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/PortalPrepareResponse.java (from rev 9913, modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/PortalActionResponse.java) =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/PortalPrepareResponse.java (rev 0) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/PortalPrepareResponse.java 2008-02-10 02:16:32 UTC (rev 9915) @@ -0,0 +1,242 @@ +/****************************************************************************** + * 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.PortletInvoker; +import org.jboss.portal.portlet.PortletInvokerException; + +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.Cookie; +import javax.servlet.ServletOutputStream; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.Writer; +import java.util.Locale; +import java.util.Map; +import java.util.HashMap; +import java.util.Set; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public class PortalPrepareResponse extends PortalResponse +{ + + /** . */ + private String contentType; + + /** . */ + private Locale locale; + + /** . */ + private String characterEncoding; + + /** . */ + private int bufferSize; + + /** . */ + private ServletOutputStream outputStream; + + /** . */ + private PrintWriter writer; + + /** . */ + private Map<String, Portlet> windows; + + public PortalPrepareResponse(HttpServletResponse response, PortletInvoker invoker) throws PortletInvokerException + { + super(response, invoker); + + // + this.windows = new HashMap<String, Portlet>(); + } + + public void addWindow(String windowId, Portlet portlet) + { + windows.put(windowId, portlet); + } + + public Set<String> getWindowIds() + { + return windows.keySet(); + } + + public Portlet getPortlet(String windowId) + { + return windows.get(windowId); + } + + public ServletOutputStream getOutputStream() throws IOException + { + if (writer != null) + { + throw new IllegalStateException(); + } + if (outputStream == null) + { + outputStream = new ServletOutputStream() + { + public void write(int b) throws IOException + { + } + }; + } + return outputStream; + } + + public PrintWriter getWriter() throws IOException + { + if (outputStream != null) + { + throw new IllegalStateException(); + } + if (writer == null) + { + Writer tmp = new Writer() + { + public void write(char cbuf[], int off, int len) throws IOException + { + } + public void flush() throws IOException + { + } + public void close() throws IOException + { + } + }; + writer = new PrintWriter(tmp); + } + return writer; + } + + public void flushBuffer() throws IOException + { + } + + public boolean isCommitted() + { + return false; + } + + public void reset() + { + } + + public void resetBuffer() + { + } + + public void sendError(int i, String s) throws IOException + { + } + + public void sendError(int i) throws IOException + { + } + + public void sendRedirect(String s) throws IOException + { + } + + public void addCookie(Cookie cookie) + { + } + + public void setDateHeader(String s, long l) + { + } + + public void addDateHeader(String s, long l) + { + } + + public void setHeader(String s, String s1) + { + } + + public void addHeader(String s, String s1) + { + } + + public void setContentType(String contentType) + { + this.contentType = contentType; + } + + public void setContentLength(int i) + { + } + + public void setCharacterEncoding(String characterEncoding) + { + this.characterEncoding = characterEncoding; + } + + public void setIntHeader(String s, int i) + { + } + + public void addIntHeader(String s, int i) + { + } + + public void setStatus(int i) + { + } + + public void setStatus(int i, String s) + { + } + + public void setLocale(Locale locale) + { + this.locale = locale; + } + + public String getContentType() + { + return contentType; + } + + public Locale getLocale() + { + return locale; + } + + public String getCharacterEncoding() + { + return characterEncoding; + } + + public void setBufferSize(int bufferSize) + { + this.bufferSize = bufferSize; + } + + public int getBufferSize() + { + return bufferSize; + } +} Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PageParamTag.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PageParamTag.java 2008-02-10 01:37:59 UTC (rev 9914) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PageParamTag.java 2008-02-10 02:16:32 UTC (rev 9915) @@ -23,6 +23,7 @@ package org.jboss.portal.portlet.test.jsp.taglib; import org.jboss.portal.portlet.test.jsp.PortalRenderResponse; +import org.jboss.portal.portlet.test.jsp.PortalPrepareResponse; import javax.servlet.jsp.JspException; import javax.xml.namespace.QName; @@ -87,7 +88,7 @@ this.frozen = frozen; } - public void doRenderTag(PortalRenderResponse renderResponse) throws JspException, IOException + public void doTag(PortalRenderResponse renderResponse) throws JspException, IOException { if (renderResponse.isPageStateModifiable()) { @@ -105,7 +106,7 @@ } } - public void doActionTag() throws JspException, IOException + public void doTag(PortalPrepareResponse prepareResponse) throws JspException, IOException { } } 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-10 01:37:59 UTC (rev 9914) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PageTag.java 2008-02-10 02:16:32 UTC (rev 9915) @@ -23,8 +23,7 @@ package org.jboss.portal.portlet.test.jsp.taglib; import org.jboss.portal.portlet.test.jsp.PortalRenderResponse; -import org.jboss.portal.portlet.test.jsp.PortalResponse; -import org.jboss.portal.portlet.test.jsp.PortalActionResponse; +import org.jboss.portal.portlet.test.jsp.PortalPrepareResponse; import javax.servlet.jsp.JspException; import javax.xml.namespace.QName; @@ -55,7 +54,7 @@ /** . */ Status status = Status.ACTIVE; - public int doStartRenderTag(PortalRenderResponse renderResponse) throws JspException + public int doStartTag(PortalRenderResponse renderResponse) throws JspException { maximizedId = renderResponse.getMaximizedWindowId(); @@ -70,7 +69,7 @@ } } - public int doEndRenderTag(PortalRenderResponse renderResponse) throws JspException + public int doEndTag(PortalRenderResponse renderResponse) throws JspException { if (maximizedId != null) { @@ -88,12 +87,12 @@ return EVAL_PAGE; } - public int doStartActionTag(PortalActionResponse portalResponse) throws JspException + public int doStartTag(PortalPrepareResponse portalResponse) throws JspException { return EVAL_BODY_INCLUDE; } - public int doEndActionTag(PortalActionResponse portalResponse) throws JspException + public int doEndTag(PortalPrepareResponse portalResponse) throws JspException { return EVAL_PAGE; } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/ParamTag.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/ParamTag.java 2008-02-10 01:37:59 UTC (rev 9914) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/ParamTag.java 2008-02-10 02:16:32 UTC (rev 9915) @@ -61,7 +61,7 @@ this.value = value; } - public void doRenderTag(PortalRenderResponse renderResponse) throws JspException, IOException + public void doTag(PortalRenderResponse renderResponse) throws JspException, IOException { AbstractURLTag urlTag = (AbstractURLTag)SimpleTagSupport.findAncestorWithClass(this, AbstractURLTag.class); urlTag.setParam(name, value); Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortalBodyTagSupport.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortalBodyTagSupport.java 2008-02-10 01:37:59 UTC (rev 9914) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortalBodyTagSupport.java 2008-02-10 02:16:32 UTC (rev 9915) @@ -23,7 +23,7 @@ package org.jboss.portal.portlet.test.jsp.taglib; import org.jboss.portal.portlet.test.jsp.PortalRenderResponse; -import org.jboss.portal.portlet.test.jsp.PortalActionResponse; +import org.jboss.portal.portlet.test.jsp.PortalPrepareResponse; import org.jboss.portal.portlet.test.jsp.PortalResponse; import org.jboss.portal.common.NotYetImplemented; @@ -72,13 +72,13 @@ } else { - if (portalResponse instanceof PortalActionResponse) + if (portalResponse instanceof PortalPrepareResponse) { - return doStartActionTag((PortalActionResponse)portalResponse); + return doStartTag((PortalPrepareResponse)portalResponse); } else { - return doStartRenderTag((PortalRenderResponse)portalResponse); + return doStartTag((PortalRenderResponse)portalResponse); } } } @@ -96,13 +96,13 @@ // if (pageTag != null && pageTag.status == PageTag.Status.ACTIVE) { - if (portalResponse instanceof PortalActionResponse) + if (portalResponse instanceof PortalPrepareResponse) { - return doEndActionTag((PortalActionResponse)portalResponse); + return doEndTag((PortalPrepareResponse)portalResponse); } else { - return doEndRenderTag((PortalRenderResponse)portalResponse); + return doEndTag((PortalRenderResponse)portalResponse); } } else @@ -111,22 +111,22 @@ } } - public int doStartActionTag(PortalActionResponse actionResponse) throws JspException + public int doStartTag(PortalPrepareResponse prepareResponse) throws JspException { throw new NotYetImplemented(); } - public int doEndActionTag(PortalActionResponse actionResponse) throws JspException + public int doEndTag(PortalPrepareResponse prepareResponse) throws JspException { throw new NotYetImplemented(); } - public int doStartRenderTag(PortalRenderResponse renderResponse) throws JspException + public int doStartTag(PortalRenderResponse renderResponse) throws JspException { throw new NotYetImplemented(); } - public int doEndRenderTag(PortalRenderResponse renderResponse) throws JspException + public int doEndTag(PortalRenderResponse renderResponse) throws JspException { throw new NotYetImplemented(); } 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-10 01:37:59 UTC (rev 9914) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortalSimpleTagSupport.java 2008-02-10 02:16:32 UTC (rev 9915) @@ -24,7 +24,7 @@ import org.jboss.portal.portlet.test.jsp.PortalRenderResponse; import org.jboss.portal.portlet.test.jsp.PortalResponse; -import org.jboss.portal.portlet.test.jsp.PortalActionResponse; +import org.jboss.portal.portlet.test.jsp.PortalPrepareResponse; import org.jboss.portal.common.NotYetImplemented; import javax.servlet.jsp.tagext.SimpleTagSupport; @@ -51,24 +51,27 @@ // if (pageTag != null && pageTag.status == PageTag.Status.ACTIVE) { - if (getPortalResponse() instanceof PortalActionResponse) + PortalResponse portalResponse = getPortalResponse(); + + // + if (portalResponse instanceof PortalPrepareResponse) { - doActionTag(); + doTag((PortalPrepareResponse)portalResponse); } else { - doRenderTag((PortalRenderResponse)getPortalResponse()); + doTag((PortalRenderResponse)portalResponse); } } } - public void doActionTag() throws JspException, IOException + public void doTag(PortalPrepareResponse prepareResponse) throws JspException, IOException { throw new NotYetImplemented(); } - public void doRenderTag(PortalRenderResponse renderResponse) throws JspException, IOException + public void doTag(PortalRenderResponse renderResponse) throws JspException, IOException { - super.doTag(); + throw new NotYetImplemented(); } } 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-10 01:37:59 UTC (rev 9914) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletMarkupTag.java 2008-02-10 02:16:32 UTC (rev 9915) @@ -39,7 +39,7 @@ */ public class PortletMarkupTag extends PortalSimpleTagSupport { - public void doRenderTag(PortalRenderResponse renderResponse) throws JspException, IOException + public void doTag(PortalRenderResponse renderResponse) throws JspException, IOException { PortletTag portletTag = (PortletTag)SimpleTagSupport.findAncestorWithClass(this, PortletTag.class); 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-10 01:37:59 UTC (rev 9914) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletTag.java 2008-02-10 02:16:32 UTC (rev 9915) @@ -23,7 +23,7 @@ package org.jboss.portal.portlet.test.jsp.taglib; import org.jboss.portal.portlet.test.jsp.PortalRenderResponse; -import org.jboss.portal.portlet.test.jsp.PortalActionResponse; +import org.jboss.portal.portlet.test.jsp.PortalPrepareResponse; import org.jboss.portal.portlet.test.jsp.PortalResponse; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.invocation.response.FragmentResponse; @@ -209,21 +209,21 @@ this.windowId = null; } - public int doStartActionTag(PortalActionResponse actionResponse) throws JspException + public int doStartTag(PortalPrepareResponse prepareResponse) throws JspException { - initState(actionResponse); + initState(prepareResponse); // if (portlet != null) { - actionResponse.addWindow(windowId, portlet); + prepareResponse.addWindow(windowId, portlet); } // return SKIP_BODY; } - public int doEndActionTag(PortalActionResponse actionResponse) throws JspException + public int doEndTag(PortalPrepareResponse prepareResponse) throws JspException { destroyState(); @@ -231,7 +231,7 @@ return EVAL_PAGE; } - public int doStartRenderTag(PortalRenderResponse renderResponse) throws JspException + public int doStartTag(PortalRenderResponse renderResponse) throws JspException { initState(renderResponse); @@ -263,7 +263,7 @@ } } - public int doEndRenderTag(PortalRenderResponse renderResponse) throws JspException + public int doEndTag(PortalRenderResponse renderResponse) throws JspException { if (bodyContent != null) { 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-10 01:37:59 UTC (rev 9914) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletTitleTag.java 2008-02-10 02:16:32 UTC (rev 9915) @@ -38,7 +38,7 @@ public class PortletTitleTag extends PortalSimpleTagSupport { - public void doRenderTag(PortalRenderResponse renderResponse) throws JspException, IOException + public void doTag(PortalRenderResponse renderResponse) throws JspException, IOException { PortletTag portletTag = (PortletTag)SimpleTagSupport.findAncestorWithClass(this, PortletTag.class); 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-10 01:37:59 UTC (rev 9914) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/PortletURLTag.java 2008-02-10 02:16:32 UTC (rev 9915) @@ -70,12 +70,12 @@ this.windowStateValue = windowState; } - public int doStartRenderTag(PortalRenderResponse renderResponse) throws JspException + public int doStartTag(PortalRenderResponse renderResponse) throws JspException { return EVAL_BODY_BUFFERED; } - public int doEndRenderTag(PortalRenderResponse renderResponse) throws JspException + public int doEndTag(PortalRenderResponse renderResponse) throws JspException { PagePortletControllerContext context = renderResponse.getPortletControllerContext(); PortletTag portletTag = (PortletTag)SimpleTagSupport.findAncestorWithClass(this, PortletTag.class);