[portal-commits] JBoss Portal SVN: r9011 - in branches/UIServer: core-uiserver/src/main/org/jboss/portal/core/presentation/server/content and 7 other directories.

Author: julien(a)jboss.com Date: 2007-11-18 13:08:08 -0500 (Sun, 18 Nov 2007) New Revision: 9011 Added: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/client/ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/client/PresentationContext.java branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/PresentationContextImpl.java Removed: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/RequestContext.java branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/RequestContextImpl.java Modified: branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/presentation/server/MainProcessor.java branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/presentation/server/PresentationServerImpl.java branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/presentation/server/content/PresentationContentRendererContext.java branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/presentation/server/content/portlet/PresentationRequestContext.java branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/controller/UIController.java branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/classic/entry/PortalEntryPoint.java branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/PresentationServer.java branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/Processor.java Log: renamed RequestContext to PresentationContext and moved into a new client package of org.jboss.portal.presentation Modified: branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/presentation/server/MainProcessor.java =================================================================== --- branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/presentation/server/MainProcessor.java 2007-11-18 18:04:51 UTC (rev 9010) +++ branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/presentation/server/MainProcessor.java 2007-11-18 18:08:08 UTC (rev 9011) @@ -27,7 +27,7 @@ import org.jboss.portal.server.ServerException; -import org.jboss.portal.presentation.RequestContext; +import org.jboss.portal.presentation.client.PresentationContext; import org.jboss.portal.presentation.protocol.ViewUIObjectAction; import org.jboss.portal.presentation.protocol.ShowUIObjectResponse; import org.jboss.portal.presentation.protocol.ServerAction; @@ -49,7 +49,7 @@ /** * */ - public ProcessorResponse process(RequestContext requestContext, ProcessorRequest request) throws ServerException + public ProcessorResponse process(PresentationContext presentationContext, ProcessorRequest request) throws ServerException { try { Modified: branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/presentation/server/PresentationServerImpl.java =================================================================== --- branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/presentation/server/PresentationServerImpl.java 2007-11-18 18:04:51 UTC (rev 9010) +++ branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/presentation/server/PresentationServerImpl.java 2007-11-18 18:08:08 UTC (rev 9011) @@ -22,14 +22,13 @@ ******************************************************************************/ package org.jboss.portal.core.presentation.server; -import org.jboss.portal.presentation.RequestContext; +import org.jboss.portal.presentation.client.PresentationContext; import org.jboss.portal.presentation.server.Processor; import org.jboss.portal.presentation.server.PresentationServer; import org.jboss.portal.presentation.model.UIWindow; import org.jboss.portal.presentation.model.content.WindowContent; import org.jboss.portal.presentation.model.state.ModelLoader; import org.jboss.portal.core.controller.ControllerResponse; -import org.jboss.portal.core.controller.Controller; import org.jboss.portal.core.model.portal.command.response.MarkupResponse; import org.jboss.portal.core.model.portal.PortalObjectId; import org.jboss.portal.core.model.portal.PortalObjectPath; @@ -150,7 +149,7 @@ this.portalObjectContainer = portalObjectContainer; } - public WindowContent render(RequestContext context, UIWindow uiwindow) throws Exception + public WindowContent render(PresentationContext context, UIWindow uiwindow) throws Exception { PortalObjectId windowId = PortalObjectId.parse(uiwindow.getId(), PortalObjectPath.CANONICAL_FORMAT); Window window = (Window)portalObjectContainer.getObject(windowId); Modified: branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/presentation/server/content/PresentationContentRendererContext.java =================================================================== --- branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/presentation/server/content/PresentationContentRendererContext.java 2007-11-18 18:04:51 UTC (rev 9010) +++ branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/presentation/server/content/PresentationContentRendererContext.java 2007-11-18 18:08:08 UTC (rev 9011) @@ -32,7 +32,7 @@ import org.jboss.portal.core.presentation.server.content.portlet.PresentationUserContext; import org.jboss.portal.core.presentation.server.content.portlet.PresentationSecurityContext; import org.jboss.portal.presentation.model.UIWindow; -import org.jboss.portal.presentation.RequestContext; +import org.jboss.portal.presentation.client.PresentationContext; import org.jboss.portal.Mode; import org.jboss.portal.WindowState; import org.jboss.portal.portlet.invocation.RenderInvocation; @@ -46,7 +46,7 @@ { /** . */ - private final RequestContext requestContext; + private final PresentationContext presentationContext; /** . */ private final UIWindow uiwindow; @@ -54,9 +54,9 @@ /** . */ private final Window window; - public PresentationContentRendererContext(RequestContext requestContext, UIWindow uiwindow, Window window) + public PresentationContentRendererContext(PresentationContext presentationContext, UIWindow uiwindow, Window window) { - this.requestContext = requestContext; + this.presentationContext = presentationContext; this.uiwindow = uiwindow; this.window = window; } @@ -99,7 +99,7 @@ public RenderInvocation createRenderInvocation(WindowNavigationalState navigationalState) { RenderInvocation invocation = new RenderInvocation(new PresentationRenderContext(navigationalState)); - invocation.setRequestContext(new PresentationRequestContext(requestContext)); + invocation.setRequestContext(new PresentationRequestContext(presentationContext)); invocation.setWindowContext(new WindowContextImpl(window)); invocation.setPortalContext(new PresentationPortalContext()); invocation.setUserContext(new PresentationUserContext()); Modified: branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/presentation/server/content/portlet/PresentationRequestContext.java =================================================================== --- branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/presentation/server/content/portlet/PresentationRequestContext.java 2007-11-18 18:04:51 UTC (rev 9010) +++ branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/presentation/server/content/portlet/PresentationRequestContext.java 2007-11-18 18:08:08 UTC (rev 9011) @@ -36,9 +36,9 @@ { /** . */ - private final org.jboss.portal.presentation.RequestContext context; + private final org.jboss.portal.presentation.client.PresentationContext context; - public PresentationRequestContext(org.jboss.portal.presentation.RequestContext context) + public PresentationRequestContext(org.jboss.portal.presentation.client.PresentationContext context) { this.context = context; } Deleted: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/RequestContext.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/RequestContext.java 2007-11-18 18:04:51 UTC (rev 9010) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/RequestContext.java 2007-11-18 18:08:08 UTC (rev 9011) @@ -1,58 +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.presentation; - -import org.jboss.portal.presentation.protocol.ServerAction; -import org.jboss.portal.presentation.model.UIContext; -import org.jboss.portal.server.ServerInvocation; -import org.jboss.portal.web.ServletContextDispatcher; - -/** - * The contract that defines the services that the client provides to the server during a server invocation. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public interface RequestContext -{ - - /** - * Create a string representation of the server action. - * - * @param action the server action to render - * @return the rendition of the server action - * @throws IllegalArgumentException if the action cannot be rendered - */ - String render(ServerAction action) throws IllegalArgumentException; - - /** - * Returns the root UI context provided by the portal. - */ - UIContext getUIContext(); - - /** - * - * @return - */ - ServletContextDispatcher getDispatcher(); -} Copied: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/client/PresentationContext.java (from rev 9010, branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/RequestContext.java) =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/client/PresentationContext.java (rev 0) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/client/PresentationContext.java 2007-11-18 18:08:08 UTC (rev 9011) @@ -0,0 +1,58 @@ +/****************************************************************************** + * 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.presentation.client; + +import org.jboss.portal.presentation.protocol.ServerAction; +import org.jboss.portal.presentation.model.UIContext; +import org.jboss.portal.server.ServerInvocation; +import org.jboss.portal.web.ServletContextDispatcher; + +/** + * The contract that defines the services that the client provides to the server during a server invocation. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public interface PresentationContext +{ + + /** + * Create a string representation of the server action. + * + * @param action the server action to render + * @return the rendition of the server action + * @throws IllegalArgumentException if the action cannot be rendered + */ + String render(ServerAction action) throws IllegalArgumentException; + + /** + * Returns the root UI context provided by the portal. + */ + UIContext getUIContext(); + + /** + * + * @return + */ + ServletContextDispatcher getDispatcher(); +} Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/controller/UIController.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/controller/UIController.java 2007-11-18 18:04:51 UTC (rev 9010) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/controller/UIController.java 2007-11-18 18:08:08 UTC (rev 9011) @@ -28,9 +28,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.jboss.portal.presentation.RequestContext; +import org.jboss.portal.presentation.client.PresentationContext; import org.jboss.portal.presentation.protocol.ShowUIObjectResponse; -import org.jboss.portal.presentation.impl.RequestContextImpl; +import org.jboss.portal.presentation.impl.PresentationContextImpl; import org.jboss.portal.presentation.server.ProcessorRequest; import org.jboss.portal.presentation.server.ProcessorResponse; import org.jboss.portal.presentation.server.PresentationServer; @@ -90,22 +90,22 @@ /** * TODO: decouple the implementation via factory pattern */ - RequestContext requestContext = new RequestContextImpl(this.presentationServer, + PresentationContext presentationContext = new PresentationContextImpl(this.presentationServer, invocation); - request.setAttribute("requestContext", requestContext); + request.setAttribute("requestContext", presentationContext); /** * TODO: move this functionality to another component like a UIPresenter etc */ - ServerAction serverAction = this.getServerAction(requestContext); + ServerAction serverAction = this.getServerAction(presentationContext); ProcessorRequest processorRequest = new ProcessorRequest(serverAction); - ProcessorResponse processorResponse = this.presentationServer.getProcessor().process(requestContext, + ProcessorResponse processorResponse = this.presentationServer.getProcessor().process(presentationContext, processorRequest); //Process the response from the Processor ServerResponse serverResponse = processorResponse.getResponse(); - this.handle(requestContext, serverResponse); + this.handle(presentationContext, serverResponse); } catch(Exception e) { @@ -118,18 +118,18 @@ * @param serverResponse * @throws ServerException */ - private void handle(RequestContext requestContext, ServerResponse serverResponse) throws ServerException + private void handle(PresentationContext presentationContext, ServerResponse serverResponse) throws ServerException { try { - HttpServletResponse response = requestContext.getInvocation().getServerContext().getClientResponse(); + HttpServletResponse response = presentationContext.getInvocation().getServerContext().getClientResponse(); if(serverResponse instanceof ShowUIObjectResponse) { ShowUIObjectResponse show = (ShowUIObjectResponse)serverResponse; String targetId = show.getTargetId(); //Load the objects in the UITree - UIObject uiObject = requestContext.getUIContext().getObject(targetId); + UIObject uiObject = presentationContext.getUIContext().getObject(targetId); if(uiObject instanceof UIPage) { @@ -146,7 +146,7 @@ if(cour instanceof UIWindow) { UIWindow window = (UIWindow)cour; - WindowContent windowContent = this.presentationServer.render(requestContext, window); + WindowContent windowContent = this.presentationServer.render(presentationContext, window); /** * TODO: decouple this from the model implementation by moving the functinality @@ -157,7 +157,7 @@ } } } - this.render(response.getWriter(), requestContext.getUIContext(), targetId); + this.render(response.getWriter(), presentationContext.getUIContext(), targetId); } } } @@ -205,11 +205,11 @@ /** * */ - private ServerAction getServerAction(RequestContext requestContext) + private ServerAction getServerAction(PresentationContext presentationContext) { ServerAction serverAction = null; - ServerInvocation invocation = requestContext.getInvocation(); + ServerInvocation invocation = presentationContext.getInvocation(); ServerInvocationContext invocationContext = invocation.getServerContext(); HttpServletRequest request = invocationContext.getClientRequest(); Copied: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/PresentationContextImpl.java (from rev 9010, branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/RequestContextImpl.java) =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/PresentationContextImpl.java (rev 0) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/PresentationContextImpl.java 2007-11-18 18:08:08 UTC (rev 9011) @@ -0,0 +1,98 @@ +/****************************************************************************** + * 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.presentation.impl; + +import javax.servlet.http.HttpSession; + +import org.jboss.portal.presentation.client.PresentationContext; +import org.jboss.portal.presentation.protocol.ServerAction; +import org.jboss.portal.presentation.model.UIContext; +import org.jboss.portal.presentation.server.PresentationServer; +import org.jboss.portal.presentation.impl.model.UIContextImpl; +import org.jboss.portal.server.ServerInvocation; +import org.jboss.portal.web.ServletContextDispatcher; + +/** + * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> + * + */ +public class PresentationContextImpl implements PresentationContext +{ + /** + * + */ + private ServerInvocation invocation = null; + + private PresentationServer presentationServer = null; + + /** + * + * @param invocation + */ + public PresentationContextImpl(PresentationServer presentationServer, ServerInvocation invocation) + { + this.invocation = invocation; + this.presentationServer = presentationServer; + } + + /** + * + * @return + */ + public UIContext getUIContext() + { + HttpSession session = this.invocation.getServerContext().getClientRequest().getSession(); + + UIContext uiContext = (UIContext)session.getAttribute("uicontext"); + if(uiContext == null) + { + /** + * TODO: decouple the implementation via factory pattern + */ + uiContext = new UIContextImpl(this.presentationServer.getModelLoader()); + session.setAttribute("uicontext", uiContext); + } + + return uiContext; + } + + /** + * + */ + public ServletContextDispatcher getDispatcher() + { + return new ServletContextDispatcher(this.invocation.getServerContext().getClientRequest(), + this.invocation.getServerContext().getClientResponse(), this.invocation.getRequest().getServer().getServletContainerContext()); + } + + /** + * + * @param action + * @return + * @throws IllegalArgumentException + */ + public String render(ServerAction action) throws IllegalArgumentException + { + return "TODO"; + } +} Deleted: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/RequestContextImpl.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/RequestContextImpl.java 2007-11-18 18:04:51 UTC (rev 9010) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/RequestContextImpl.java 2007-11-18 18:08:08 UTC (rev 9011) @@ -1,98 +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.presentation.impl; - -import javax.servlet.http.HttpSession; - -import org.jboss.portal.presentation.RequestContext; -import org.jboss.portal.presentation.protocol.ServerAction; -import org.jboss.portal.presentation.model.UIContext; -import org.jboss.portal.presentation.server.PresentationServer; -import org.jboss.portal.presentation.impl.model.UIContextImpl; -import org.jboss.portal.server.ServerInvocation; -import org.jboss.portal.web.ServletContextDispatcher; - -/** - * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> - * - */ -public class RequestContextImpl implements RequestContext -{ - /** - * - */ - private ServerInvocation invocation = null; - - private PresentationServer presentationServer = null; - - /** - * - * @param invocation - */ - public RequestContextImpl(PresentationServer presentationServer, ServerInvocation invocation) - { - this.invocation = invocation; - this.presentationServer = presentationServer; - } - - /** - * - * @return - */ - public UIContext getUIContext() - { - HttpSession session = this.invocation.getServerContext().getClientRequest().getSession(); - - UIContext uiContext = (UIContext)session.getAttribute("uicontext"); - if(uiContext == null) - { - /** - * TODO: decouple the implementation via factory pattern - */ - uiContext = new UIContextImpl(this.presentationServer.getModelLoader()); - session.setAttribute("uicontext", uiContext); - } - - return uiContext; - } - - /** - * - */ - public ServletContextDispatcher getDispatcher() - { - return new ServletContextDispatcher(this.invocation.getServerContext().getClientRequest(), - this.invocation.getServerContext().getClientResponse(), this.invocation.getRequest().getServer().getServletContainerContext()); - } - - /** - * - * @param action - * @return - * @throws IllegalArgumentException - */ - public String render(ServerAction action) throws IllegalArgumentException - { - return "TODO"; - } -} Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/classic/entry/PortalEntryPoint.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/classic/entry/PortalEntryPoint.java 2007-11-18 18:04:51 UTC (rev 9010) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/classic/entry/PortalEntryPoint.java 2007-11-18 18:08:08 UTC (rev 9011) @@ -23,12 +23,10 @@ package org.jboss.portal.presentation.impl.classic.entry; import java.io.IOException; -import java.io.PrintWriter; import java.nio.charset.Charset; import java.util.Collections; import java.util.HashMap; import java.util.Iterator; -import java.util.List; import java.util.Map; import javax.management.MBeanServer; @@ -60,17 +58,7 @@ import org.jboss.portal.server.ServerResponse; import org.jboss.portal.server.impl.ServerInvocationContextImpl; import org.jboss.portal.server.request.URLContext; -import org.jboss.portal.presentation.layout.LayoutManager; -import org.jboss.portal.presentation.impl.classic.layout.FlexibleGrid; -import org.jboss.portal.presentation.impl.classic.layout.FlexibleGridConstraints; -import org.jboss.portal.presentation.impl.classic.layout.FlexibleGridLayoutManager; -import org.jboss.portal.presentation.impl.classic.layout.RegionConstraints; -import org.jboss.portal.presentation.impl.classic.layout.RegionLayoutManager; -import org.jboss.portal.presentation.server.ProcessorResponse; import org.jboss.portal.presentation.entry.EntryPoint; -import org.jboss.portal.presentation.RequestContext; -import org.jboss.portal.presentation.model.*; -import org.jboss.portal.presentation.model.content.WindowContent; /** * The Portal Server Entry Point for classic html mode Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/PresentationServer.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/PresentationServer.java 2007-11-18 18:04:51 UTC (rev 9010) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/PresentationServer.java 2007-11-18 18:08:08 UTC (rev 9011) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.presentation.server; -import org.jboss.portal.presentation.RequestContext; +import org.jboss.portal.presentation.client.PresentationContext; import org.jboss.portal.presentation.model.UIWindow; import org.jboss.portal.presentation.model.content.WindowContent; import org.jboss.portal.presentation.model.state.ModelLoader; @@ -47,7 +47,7 @@ * @return the markup of the window * @throws Exception for now a generic exception */ - WindowContent render(RequestContext context, UIWindow window) throws Exception; + WindowContent render(PresentationContext context, UIWindow window) throws Exception; /** * Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/Processor.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/Processor.java 2007-11-18 18:04:51 UTC (rev 9010) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/server/Processor.java 2007-11-18 18:08:08 UTC (rev 9011) @@ -23,7 +23,7 @@ package org.jboss.portal.presentation.server; import org.jboss.portal.server.ServerException; -import org.jboss.portal.presentation.RequestContext; +import org.jboss.portal.presentation.client.PresentationContext; /** * UIServer calls the Processor to hand it @@ -40,5 +40,5 @@ * @param request * @throws ServerException */ - public ProcessorResponse process(RequestContext requestContext,ProcessorRequest request) throws ServerException; + public ProcessorResponse process(PresentationContext presentationContext,ProcessorRequest request) throws ServerException; }