[portal-commits] JBoss Portal SVN: r6701 - in trunk: faces/src/main/org/jboss/portal/faces/component/portlet and 22 other directories.

Author: julien(a)jboss.com Date: 2007-03-15 17:34:02 -0400 (Thu, 15 Mar 2007) New Revision: 6701 Added: trunk/server/src/main/org/jboss/portal/common/ trunk/server/src/main/org/jboss/portal/common/http/ trunk/server/src/main/org/jboss/portal/common/http/HTTPStreamInfo.java Removed: trunk/server/src/main/org/jboss/portal/server/util/HTTPStreamInfo.java Modified: trunk/core/src/main/org/jboss/portal/core/controller/portlet/PortletInvocationFactory.java trunk/faces/src/main/org/jboss/portal/faces/component/portlet/JSFActionContext.java trunk/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java trunk/faces/src/main/org/jboss/portal/faces/component/portlet/JSFRenderContext.java trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ModesInterceptor.java trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/api/RenderResponseImpl.java trunk/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractActionContext.java trunk/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractPortletInvocationContext.java trunk/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractRenderContext.java trunk/portlet/src/main/org/jboss/portal/portlet/invocation/PortletInvocation.java trunk/portlet/src/main/org/jboss/portal/portlet/spi/PortletInvocationContext.java trunk/portlet/src/main/org/jboss/portal/portlet/support/spi/PortletInvocationContextSupport.java trunk/server/src/main/org/jboss/portal/server/ServerResponse.java trunk/server/src/main/org/jboss/portal/server/aspects/server/ContentTypeInterceptor.java trunk/theme/src/main/org/jboss/portal/test/theme/render/TestRenderedMarkup.java trunk/theme/src/main/org/jboss/portal/test/theme/servlet/TestThemeServlet.java trunk/theme/src/main/org/jboss/portal/theme/LayoutServiceInfo.java trunk/theme/src/main/org/jboss/portal/theme/PortalLayout.java trunk/theme/src/main/org/jboss/portal/theme/impl/LayoutServiceImpl.java trunk/theme/src/main/org/jboss/portal/theme/render/RenderContext.java trunk/theme/src/main/org/jboss/portal/theme/strategy/StrategyContext.java trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/TestPortletInvocationContext.java trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/RequestPrecursor.java trunk/wsrp/src/main/org/jboss/portal/wsrp/invocation/WSRPActionContext.java trunk/wsrp/src/main/org/jboss/portal/wsrp/invocation/WSRPPortletInvocationContext.java trunk/wsrp/src/main/org/jboss/portal/wsrp/invocation/WSRPRenderContext.java trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/ActionRequestProcessor.java trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/RenderRequestProcessor.java trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/RequestProcessor.java Log: moved HTTPStreamInfo to the common package Modified: trunk/core/src/main/org/jboss/portal/core/controller/portlet/PortletInvocationFactory.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/controller/portlet/PortletInvocationFactory.java 2007-03-15 21:27:09 UTC (rev 6700) +++ trunk/core/src/main/org/jboss/portal/core/controller/portlet/PortletInvocationFactory.java 2007-03-15 21:34:02 UTC (rev 6701) @@ -43,7 +43,7 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; import org.jboss.portal.common.invocation.EmptyAttributeResolver; -import org.jboss.portal.server.util.HTTPStreamInfo; +import org.jboss.portal.common.http.HTTPStreamInfo; import org.jboss.portal.server.impl.MapAttributeResolver; import org.jboss.portal.server.request.URLContext; import org.jboss.portal.server.request.URLFormat; Modified: trunk/faces/src/main/org/jboss/portal/faces/component/portlet/JSFActionContext.java =================================================================== --- trunk/faces/src/main/org/jboss/portal/faces/component/portlet/JSFActionContext.java 2007-03-15 21:27:09 UTC (rev 6700) +++ trunk/faces/src/main/org/jboss/portal/faces/component/portlet/JSFActionContext.java 2007-03-15 21:34:02 UTC (rev 6701) @@ -29,7 +29,7 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; import org.jboss.portal.common.invocation.EmptyAttributeResolver; -import org.jboss.portal.server.util.HTTPStreamInfo; +import org.jboss.portal.common.http.HTTPStreamInfo; import org.jboss.portal.server.impl.RequestAttributeResolver; import org.jboss.portal.server.impl.PrincipalAttributeResolver; import org.jboss.portal.server.impl.MapAttributeResolver; Modified: trunk/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java =================================================================== --- trunk/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java 2007-03-15 21:27:09 UTC (rev 6700) +++ trunk/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java 2007-03-15 21:34:02 UTC (rev 6701) @@ -46,7 +46,7 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; import org.jboss.portal.bridge.JBossServletContextProvider; -import org.jboss.portal.server.util.HTTPStreamInfo; +import org.jboss.portal.common.http.HTTPStreamInfo; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; Modified: trunk/faces/src/main/org/jboss/portal/faces/component/portlet/JSFRenderContext.java =================================================================== --- trunk/faces/src/main/org/jboss/portal/faces/component/portlet/JSFRenderContext.java 2007-03-15 21:27:09 UTC (rev 6700) +++ trunk/faces/src/main/org/jboss/portal/faces/component/portlet/JSFRenderContext.java 2007-03-15 21:34:02 UTC (rev 6701) @@ -24,14 +24,13 @@ import org.jboss.portal.portlet.impl.spi.AbstractRenderContext; import org.jboss.portal.portlet.PortletURL; -import org.jboss.portal.portlet.StateString; import org.jboss.portal.portlet.PortletParameters; import org.jboss.portal.portlet.PortletParametersStateString; import org.jboss.portal.portlet.invocation.PortletInvocation; import org.jboss.portal.Mode; import org.jboss.portal.WindowState; import org.jboss.portal.common.invocation.EmptyAttributeResolver; -import org.jboss.portal.server.util.HTTPStreamInfo; +import org.jboss.portal.common.http.HTTPStreamInfo; import org.jboss.portal.server.impl.MapAttributeResolver; import org.jboss.portal.server.impl.PrincipalAttributeResolver; import org.jboss.portal.server.impl.RequestAttributeResolver; Modified: trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ModesInterceptor.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ModesInterceptor.java 2007-03-15 21:27:09 UTC (rev 6700) +++ trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ModesInterceptor.java 2007-03-15 21:34:02 UTC (rev 6701) @@ -28,7 +28,7 @@ import org.jboss.portal.portlet.info.PortletInfo; import org.jboss.portal.portlet.invocation.PortletInterceptor; import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.server.util.HTTPStreamInfo; +import org.jboss.portal.common.http.HTTPStreamInfo; import java.util.HashSet; import java.util.Iterator; Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/api/RenderResponseImpl.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/api/RenderResponseImpl.java 2007-03-15 21:27:09 UTC (rev 6700) +++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/api/RenderResponseImpl.java 2007-03-15 21:34:02 UTC (rev 6701) @@ -28,7 +28,7 @@ import org.jboss.portal.portlet.invocation.response.FragmentResponse; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.impl.jsr168.PortletUtils; -import org.jboss.portal.server.util.HTTPStreamInfo; +import org.jboss.portal.common.http.HTTPStreamInfo; import javax.activation.MimeTypeParseException; import javax.portlet.PortletURL; Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractActionContext.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractActionContext.java 2007-03-15 21:27:09 UTC (rev 6700) +++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractActionContext.java 2007-03-15 21:34:02 UTC (rev 6701) @@ -27,7 +27,7 @@ import org.jboss.portal.portlet.PortletParameters; import org.jboss.portal.Mode; import org.jboss.portal.WindowState; -import org.jboss.portal.server.util.HTTPStreamInfo; +import org.jboss.portal.common.http.HTTPStreamInfo; import java.io.BufferedReader; import java.io.IOException; Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractPortletInvocationContext.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractPortletInvocationContext.java 2007-03-15 21:27:09 UTC (rev 6700) +++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractPortletInvocationContext.java 2007-03-15 21:34:02 UTC (rev 6701) @@ -24,11 +24,11 @@ import org.jboss.portal.common.invocation.AbstractInvocationContext; import org.jboss.portal.common.util.URLTools; +import org.jboss.portal.common.http.HTTPStreamInfo; import org.jboss.portal.portlet.spi.PortletInvocationContext; import org.jboss.portal.portlet.StateString; import org.jboss.portal.Mode; import org.jboss.portal.WindowState; -import org.jboss.portal.server.util.HTTPStreamInfo; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractRenderContext.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractRenderContext.java 2007-03-15 21:27:09 UTC (rev 6700) +++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractRenderContext.java 2007-03-15 21:34:02 UTC (rev 6701) @@ -26,7 +26,7 @@ import org.jboss.portal.portlet.StateString; import org.jboss.portal.Mode; import org.jboss.portal.WindowState; -import org.jboss.portal.server.util.HTTPStreamInfo; +import org.jboss.portal.common.http.HTTPStreamInfo; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: trunk/portlet/src/main/org/jboss/portal/portlet/invocation/PortletInvocation.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/portlet/invocation/PortletInvocation.java 2007-03-15 21:27:09 UTC (rev 6700) +++ trunk/portlet/src/main/org/jboss/portal/portlet/invocation/PortletInvocation.java 2007-03-15 21:34:02 UTC (rev 6701) @@ -34,7 +34,6 @@ import org.jboss.portal.portlet.spi.UserContext; import org.jboss.portal.portlet.spi.WindowContext; import org.jboss.portal.portlet.PortletContext; -import org.jboss.portal.server.ServerInvocation; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; Modified: trunk/portlet/src/main/org/jboss/portal/portlet/spi/PortletInvocationContext.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/portlet/spi/PortletInvocationContext.java 2007-03-15 21:27:09 UTC (rev 6700) +++ trunk/portlet/src/main/org/jboss/portal/portlet/spi/PortletInvocationContext.java 2007-03-15 21:34:02 UTC (rev 6701) @@ -25,9 +25,9 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; import org.jboss.portal.common.invocation.InvocationContext; +import org.jboss.portal.common.http.HTTPStreamInfo; import org.jboss.portal.portlet.PortletURL; import org.jboss.portal.portlet.StateString; -import org.jboss.portal.server.util.HTTPStreamInfo; /** * Contract that defines what input/services the caller of a portlet container must provide. Modified: trunk/portlet/src/main/org/jboss/portal/portlet/support/spi/PortletInvocationContextSupport.java =================================================================== --- trunk/portlet/src/main/org/jboss/portal/portlet/support/spi/PortletInvocationContextSupport.java 2007-03-15 21:27:09 UTC (rev 6700) +++ trunk/portlet/src/main/org/jboss/portal/portlet/support/spi/PortletInvocationContextSupport.java 2007-03-15 21:34:02 UTC (rev 6701) @@ -25,10 +25,10 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; import org.jboss.portal.common.invocation.AbstractInvocationContext; +import org.jboss.portal.common.http.HTTPStreamInfo; import org.jboss.portal.portlet.PortletURL; import org.jboss.portal.portlet.StateString; import org.jboss.portal.portlet.spi.PortletInvocationContext; -import org.jboss.portal.server.util.HTTPStreamInfo; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Copied: trunk/server/src/main/org/jboss/portal/common/http/HTTPStreamInfo.java (from rev 6697, trunk/server/src/main/org/jboss/portal/server/util/HTTPStreamInfo.java) =================================================================== --- trunk/server/src/main/org/jboss/portal/common/http/HTTPStreamInfo.java (rev 0) +++ trunk/server/src/main/org/jboss/portal/common/http/HTTPStreamInfo.java 2007-03-15 21:34:02 UTC (rev 6701) @@ -0,0 +1,64 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.common.http; + +import org.jboss.portal.common.MediaType; + +/** + * The info about how the content of an HTTP stream should be interpreted. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision$ + */ +public class HTTPStreamInfo +{ + /** The content type. */ + private final MediaType contentType; + + /** The charset. */ + private final String charset; + + public HTTPStreamInfo(MediaType contentType, String charset) + { + if (contentType == null) + { + throw new IllegalArgumentException("Content type cannot be null"); + } + if (charset == null) + { + throw new IllegalArgumentException("Charset cannot be null"); + } + this.contentType = contentType; + this.charset = charset; + } + + public MediaType getContentType() + { + return contentType; + } + + public String getCharset() + { + return charset; + } +} Property changes on: trunk/server/src/main/org/jboss/portal/common/http/HTTPStreamInfo.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Modified: trunk/server/src/main/org/jboss/portal/server/ServerResponse.java =================================================================== --- trunk/server/src/main/org/jboss/portal/server/ServerResponse.java 2007-03-15 21:27:09 UTC (rev 6700) +++ trunk/server/src/main/org/jboss/portal/server/ServerResponse.java 2007-03-15 21:34:02 UTC (rev 6701) @@ -24,7 +24,7 @@ import org.jboss.portal.server.request.URLContext; import org.jboss.portal.server.request.URLFormat; -import org.jboss.portal.server.util.HTTPStreamInfo; +import org.jboss.portal.common.http.HTTPStreamInfo; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: trunk/server/src/main/org/jboss/portal/server/aspects/server/ContentTypeInterceptor.java =================================================================== --- trunk/server/src/main/org/jboss/portal/server/aspects/server/ContentTypeInterceptor.java 2007-03-15 21:27:09 UTC (rev 6700) +++ trunk/server/src/main/org/jboss/portal/server/aspects/server/ContentTypeInterceptor.java 2007-03-15 21:34:02 UTC (rev 6701) @@ -29,7 +29,7 @@ import org.jboss.portal.server.ServerInvocation; import org.jboss.portal.server.ServerInvocationContext; import org.jboss.portal.server.ServerResponse; -import org.jboss.portal.server.util.HTTPStreamInfo; +import org.jboss.portal.common.http.HTTPStreamInfo; import javax.servlet.http.HttpServletRequest; import java.io.UnsupportedEncodingException; Deleted: trunk/server/src/main/org/jboss/portal/server/util/HTTPStreamInfo.java =================================================================== --- trunk/server/src/main/org/jboss/portal/server/util/HTTPStreamInfo.java 2007-03-15 21:27:09 UTC (rev 6700) +++ trunk/server/src/main/org/jboss/portal/server/util/HTTPStreamInfo.java 2007-03-15 21:34:02 UTC (rev 6701) @@ -1,64 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.server.util; - -import org.jboss.portal.common.MediaType; - -/** - * The info about how the content of an HTTP stream should be interpreted. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision$ - */ -public class HTTPStreamInfo -{ - /** The content type. */ - private final MediaType contentType; - - /** The charset. */ - private final String charset; - - public HTTPStreamInfo(MediaType contentType, String charset) - { - if (contentType == null) - { - throw new IllegalArgumentException("Content type cannot be null"); - } - if (charset == null) - { - throw new IllegalArgumentException("Charset cannot be null"); - } - this.contentType = contentType; - this.charset = charset; - } - - public MediaType getContentType() - { - return contentType; - } - - public String getCharset() - { - return charset; - } -} Modified: trunk/theme/src/main/org/jboss/portal/test/theme/render/TestRenderedMarkup.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/test/theme/render/TestRenderedMarkup.java 2007-03-15 21:27:09 UTC (rev 6700) +++ trunk/theme/src/main/org/jboss/portal/test/theme/render/TestRenderedMarkup.java 2007-03-15 21:34:02 UTC (rev 6701) @@ -23,10 +23,10 @@ import junit.framework.TestCase; import org.jboss.portal.common.MediaType; +import org.jboss.portal.common.http.HTTPStreamInfo; import org.jboss.portal.common.util.CLResourceLoader; import org.jboss.portal.common.util.LoaderResource; import org.jboss.portal.server.ServerRequest; -import org.jboss.portal.server.util.HTTPStreamInfo; import org.jboss.portal.test.theme.TestHelper; import org.jboss.portal.theme.LayoutService; import org.jboss.portal.theme.PortalLayout; Modified: trunk/theme/src/main/org/jboss/portal/test/theme/servlet/TestThemeServlet.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/test/theme/servlet/TestThemeServlet.java 2007-03-15 21:27:09 UTC (rev 6700) +++ trunk/theme/src/main/org/jboss/portal/test/theme/servlet/TestThemeServlet.java 2007-03-15 21:34:02 UTC (rev 6701) @@ -26,8 +26,8 @@ import org.jboss.mx.util.MBeanProxy; import org.jboss.mx.util.MBeanServerLocator; import org.jboss.portal.common.MediaType; +import org.jboss.portal.common.http.HTTPStreamInfo; import org.jboss.portal.server.ServerRequest; -import org.jboss.portal.server.util.HTTPStreamInfo; import org.jboss.portal.theme.LayoutConstants; import org.jboss.portal.theme.LayoutDispatcher; import org.jboss.portal.theme.LayoutService; Modified: trunk/theme/src/main/org/jboss/portal/theme/LayoutServiceInfo.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/LayoutServiceInfo.java 2007-03-15 21:27:09 UTC (rev 6700) +++ trunk/theme/src/main/org/jboss/portal/theme/LayoutServiceInfo.java 2007-03-15 21:34:02 UTC (rev 6701) @@ -24,7 +24,7 @@ package org.jboss.portal.theme; import org.jboss.portal.common.MediaType; -import org.jboss.portal.server.util.HTTPStreamInfo; +import org.jboss.portal.common.http.HTTPStreamInfo; import org.jboss.portal.theme.render.PortalRenderSet; import org.jboss.portal.theme.strategy.LayoutStrategy; import org.jboss.portal.theme.page.PageResult; Modified: trunk/theme/src/main/org/jboss/portal/theme/PortalLayout.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/PortalLayout.java 2007-03-15 21:27:09 UTC (rev 6700) +++ trunk/theme/src/main/org/jboss/portal/theme/PortalLayout.java 2007-03-15 21:34:02 UTC (rev 6701) @@ -24,7 +24,7 @@ import org.jboss.portal.server.ServerInvocation; import org.jboss.portal.server.ServerRequest; -import org.jboss.portal.server.util.HTTPStreamInfo; +import org.jboss.portal.common.http.HTTPStreamInfo; import org.jboss.portal.theme.render.RenderContext; import org.jboss.portal.theme.page.PageResult; Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/LayoutServiceImpl.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/LayoutServiceImpl.java 2007-03-15 21:27:09 UTC (rev 6700) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/LayoutServiceImpl.java 2007-03-15 21:34:02 UTC (rev 6701) @@ -25,7 +25,7 @@ import org.jboss.logging.Logger; import org.jboss.portal.common.MediaType; import org.jboss.portal.jems.as.system.AbstractJBossService; -import org.jboss.portal.server.util.HTTPStreamInfo; +import org.jboss.portal.common.http.HTTPStreamInfo; import org.jboss.portal.theme.LayoutException; import org.jboss.portal.theme.LayoutInfo; import org.jboss.portal.theme.LayoutService; Modified: trunk/theme/src/main/org/jboss/portal/theme/render/RenderContext.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/render/RenderContext.java 2007-03-15 21:27:09 UTC (rev 6700) +++ trunk/theme/src/main/org/jboss/portal/theme/render/RenderContext.java 2007-03-15 21:34:02 UTC (rev 6701) @@ -23,8 +23,8 @@ package org.jboss.portal.theme.render; import org.jboss.portal.common.MediaType; +import org.jboss.portal.common.http.HTTPStreamInfo; import org.jboss.portal.server.ServerRequest; -import org.jboss.portal.server.util.HTTPStreamInfo; import org.jboss.portal.theme.LayoutInfo; import org.jboss.portal.theme.PortalLayout; import org.jboss.portal.theme.ThemeConstants; Modified: trunk/theme/src/main/org/jboss/portal/theme/strategy/StrategyContext.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/strategy/StrategyContext.java 2007-03-15 21:27:09 UTC (rev 6700) +++ trunk/theme/src/main/org/jboss/portal/theme/strategy/StrategyContext.java 2007-03-15 21:34:02 UTC (rev 6701) @@ -26,8 +26,8 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; import org.jboss.portal.common.MediaType; +import org.jboss.portal.common.http.HTTPStreamInfo; import org.jboss.portal.common.invocation.AttributeResolver; -import org.jboss.portal.server.util.HTTPStreamInfo; import org.jboss.portal.theme.navigation.WindowNavigationalState; import org.jboss.portal.theme.page.WindowContext; Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/TestPortletInvocationContext.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/TestPortletInvocationContext.java 2007-03-15 21:27:09 UTC (rev 6700) +++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/TestPortletInvocationContext.java 2007-03-15 21:34:02 UTC (rev 6701) @@ -35,7 +35,7 @@ import org.jboss.portal.portlet.spi.PortletInvocationContext; import org.jboss.portal.portlet.spi.RenderContext; import org.jboss.portal.server.impl.RequestAttributeResolver; -import org.jboss.portal.server.util.HTTPStreamInfo; +import org.jboss.portal.common.http.HTTPStreamInfo; import org.jboss.portal.wsrp.WSRPConstants; import javax.servlet.http.HttpServletRequest; Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/RequestPrecursor.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/RequestPrecursor.java 2007-03-15 21:27:09 UTC (rev 6700) +++ trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/RequestPrecursor.java 2007-03-15 21:34:02 UTC (rev 6701) @@ -25,6 +25,7 @@ import org.jboss.logging.Logger; import org.jboss.portal.common.util.ParameterValidation; +import org.jboss.portal.common.http.HTTPStreamInfo; import org.jboss.portal.portlet.PortletParametersStateString; import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.StateString; @@ -32,7 +33,6 @@ import org.jboss.portal.portlet.spi.PortletInvocationContext; import org.jboss.portal.portlet.spi.SecurityContext; import org.jboss.portal.portlet.spi.UserContext; -import org.jboss.portal.server.util.HTTPStreamInfo; import org.jboss.portal.wsrp.WSRPConstants; import org.jboss.portal.wsrp.WSRPTypeFactory; import org.jboss.portal.wsrp.WSRPUtils; Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/invocation/WSRPActionContext.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/wsrp/invocation/WSRPActionContext.java 2007-03-15 21:27:09 UTC (rev 6700) +++ trunk/wsrp/src/main/org/jboss/portal/wsrp/invocation/WSRPActionContext.java 2007-03-15 21:34:02 UTC (rev 6701) @@ -33,7 +33,7 @@ import org.jboss.portal.portlet.spi.SecurityContext; import org.jboss.portal.portlet.spi.UserContext; import org.jboss.portal.portlet.spi.WindowContext; -import org.jboss.portal.server.util.HTTPStreamInfo; +import org.jboss.portal.common.http.HTTPStreamInfo; import org.jboss.portal.wsrp.servlet.ServletAccess; import javax.servlet.ServletRequest; Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/invocation/WSRPPortletInvocationContext.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/wsrp/invocation/WSRPPortletInvocationContext.java 2007-03-15 21:27:09 UTC (rev 6700) +++ trunk/wsrp/src/main/org/jboss/portal/wsrp/invocation/WSRPPortletInvocationContext.java 2007-03-15 21:34:02 UTC (rev 6701) @@ -39,7 +39,7 @@ import org.jboss.portal.portlet.spi.WindowContext; import org.jboss.portal.server.impl.MapAttributeResolver; import org.jboss.portal.server.impl.RequestAttributeResolver; -import org.jboss.portal.server.util.HTTPStreamInfo; +import org.jboss.portal.common.http.HTTPStreamInfo; import org.jboss.portal.wsrp.WSRPPortletURL; import org.jboss.portal.wsrp.WSRPRewritingConstants; import org.jboss.portal.wsrp.servlet.ServletAccess; Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/invocation/WSRPRenderContext.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/wsrp/invocation/WSRPRenderContext.java 2007-03-15 21:27:09 UTC (rev 6700) +++ trunk/wsrp/src/main/org/jboss/portal/wsrp/invocation/WSRPRenderContext.java 2007-03-15 21:34:02 UTC (rev 6701) @@ -24,6 +24,7 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; +import org.jboss.portal.common.http.HTTPStreamInfo; import org.jboss.portal.portlet.StateString; import org.jboss.portal.portlet.spi.InstanceContext; import org.jboss.portal.portlet.spi.PortalContext; @@ -31,7 +32,6 @@ import org.jboss.portal.portlet.spi.SecurityContext; import org.jboss.portal.portlet.spi.UserContext; import org.jboss.portal.portlet.spi.WindowContext; -import org.jboss.portal.server.util.HTTPStreamInfo; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/ActionRequestProcessor.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/ActionRequestProcessor.java 2007-03-15 21:27:09 UTC (rev 6700) +++ trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/ActionRequestProcessor.java 2007-03-15 21:34:02 UTC (rev 6701) @@ -34,7 +34,7 @@ import org.jboss.portal.portlet.spi.UserContext; import org.jboss.portal.portlet.spi.WindowContext; import org.jboss.portal.portlet.state.AccessMode; -import org.jboss.portal.server.util.HTTPStreamInfo; +import org.jboss.portal.common.http.HTTPStreamInfo; import org.jboss.portal.wsrp.WSRPTypeFactory; import org.jboss.portal.wsrp.WSRPUtils; import org.jboss.portal.wsrp.core.InteractionParams; Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/RenderRequestProcessor.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/RenderRequestProcessor.java 2007-03-15 21:27:09 UTC (rev 6700) +++ trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/RenderRequestProcessor.java 2007-03-15 21:34:02 UTC (rev 6701) @@ -24,6 +24,7 @@ package org.jboss.portal.wsrp.producer; import org.jboss.portal.common.util.Tools; +import org.jboss.portal.common.http.HTTPStreamInfo; import org.jboss.portal.portlet.StateString; import org.jboss.portal.portlet.impl.jsr168.PortletUtils; import org.jboss.portal.portlet.info.CacheInfo; @@ -35,7 +36,6 @@ import org.jboss.portal.portlet.spi.UserContext; import org.jboss.portal.portlet.spi.WindowContext; import org.jboss.portal.portlet.state.AccessMode; -import org.jboss.portal.server.util.HTTPStreamInfo; import org.jboss.portal.wsrp.WSRPConstants; import org.jboss.portal.wsrp.WSRPRewritingConstants; import org.jboss.portal.wsrp.WSRPTypeFactory; Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/RequestProcessor.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/RequestProcessor.java 2007-03-15 21:27:09 UTC (rev 6700) +++ trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/RequestProcessor.java 2007-03-15 21:34:02 UTC (rev 6701) @@ -24,6 +24,7 @@ package org.jboss.portal.wsrp.producer; import org.jboss.portal.common.MediaType; +import org.jboss.portal.common.http.HTTPStreamInfo; import org.jboss.portal.common.util.Tools; import org.jboss.portal.portlet.OpaqueStateString; import org.jboss.portal.portlet.Portlet; @@ -36,7 +37,6 @@ import org.jboss.portal.portlet.spi.UserContext; import org.jboss.portal.portlet.spi.WindowContext; import org.jboss.portal.portlet.state.AccessMode; -import org.jboss.portal.server.util.HTTPStreamInfo; import org.jboss.portal.wsrp.UserContextConverter; import org.jboss.portal.wsrp.WSRPConstants; import org.jboss.portal.wsrp.WSRPUtils;