Author: julien(a)jboss.com Date: 2008-04-18 18:06:26 -0400 (Fri, 18 Apr 2008) New Revision: 10649 Added: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/PresentationPortletInvoker.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/StructuralPortletControllerContext.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/spi/ Removed: modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/PresentationPortletInvoker.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/StructuralPortletControllerContext.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/spi/ Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/spi/PresentationClientContext.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/spi/PresentationInstanceContext.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/spi/PresentationPortalContext.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/spi/PresentationServerContext.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/spi/PresentationWindowContext.java Log: move presentation server impl to presentation package so it can be reused by ajax client Copied: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet (from rev 10632, modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet) Deleted: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/PresentationPortletInvoker.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/PresentationPortletInvoker.java 2008-04-18 01:14:30 UTC (rev 10632) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/PresentationPortletInvoker.java 2008-04-18 22:06:26 UTC (rev 10649) @@ -1,47 +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.presentation.portlet; - -import org.jboss.portal.presentation.impl.state.structural.StructuralStateContextImpl; - -/** - * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -public class PresentationPortletInvoker -{ - - /** . */ - private StructuralStateContextImpl structuralContext; - - public PresentationPortletInvoker(StructuralStateContextImpl structuralContext) - { - this.structuralContext = structuralContext; - } - - public void render(String windowId) - { - - } - -} Copied: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/PresentationPortletInvoker.java (from rev 10648, modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/PresentationPortletInvoker.java) =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/PresentationPortletInvoker.java (rev 0) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/PresentationPortletInvoker.java 2008-04-18 22:06:26 UTC (rev 10649) @@ -0,0 +1,47 @@ +/****************************************************************************** + * 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.presentation.impl.server.portlet; + +import org.jboss.portal.presentation.impl.state.structural.StructuralStateContextImpl; + +/** + * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public class PresentationPortletInvoker +{ + + /** . */ + private StructuralStateContextImpl structuralContext; + + public PresentationPortletInvoker(StructuralStateContextImpl structuralContext) + { + this.structuralContext = structuralContext; + } + + public void render(String windowId) + { + + } + +} Deleted: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/StructuralPortletControllerContext.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/StructuralPortletControllerContext.java 2008-04-18 01:14:30 UTC (rev 10632) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/StructuralPortletControllerContext.java 2008-04-18 22:06:26 UTC (rev 10649) @@ -1,95 +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.presentation.portlet; - -import org.jboss.portal.portlet.controller.state.PageNavigationalState; -import org.jboss.portal.portlet.controller.state.StateControllerContext; -import org.jboss.portal.portlet.controller.event.EventControllerContext; -import org.jboss.portal.portlet.controller.PortletControllerContext; -import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.PortletInvoker; -import org.jboss.portal.portlet.spi.PortletInvocationContext; -import org.jboss.portal.portlet.info.PortletInfo; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.ActionInvocation; -import org.jboss.portal.portlet.invocation.EventInvocation; -import org.jboss.portal.portlet.invocation.ResourceInvocation; -import org.jboss.portal.presentation.impl.state.structural.PageNode; - -import javax.servlet.http.Cookie; -import java.util.List; - -/** - * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -public class StructuralPortletControllerContext implements PortletControllerContext -{ - - /** . */ - private final PageNode page; - - /** . */ - private final PortletInvoker invoker; - - public StructuralPortletControllerContext(PageNode page, PortletInvoker invoker) - { - this.page = page; - this.invoker = invoker; - } - - public PortletInfo getPortletInfo(String windowId) - { - return null; - } - - public PortletInvocationContext createPortletInvocationContext(String windowId, PageNavigationalState pageNavigationalState) - { - return null; - } - - public PortletInvocationResponse invoke(ActionInvocation actionInvocation) throws PortletInvokerException - { - return null; - } - - public PortletInvocationResponse invoke(List<Cookie> requestCookies, EventInvocation eventInvocation) throws PortletInvokerException - { - return null; - } - - public PortletInvocationResponse invoke(ResourceInvocation resourceInvocation) throws PortletInvokerException - { - return null; - } - - public EventControllerContext getEventControllerContext() - { - return null; - } - - public StateControllerContext getStateControllerContext() - { - return null; - } -} Copied: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/StructuralPortletControllerContext.java (from rev 10648, modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/StructuralPortletControllerContext.java) =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/StructuralPortletControllerContext.java (rev 0) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/StructuralPortletControllerContext.java 2008-04-18 22:06:26 UTC (rev 10649) @@ -0,0 +1,95 @@ +/****************************************************************************** + * 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.presentation.impl.server.portlet; + +import org.jboss.portal.portlet.PortletInvoker; +import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.controller.PortletControllerContext; +import org.jboss.portal.portlet.controller.event.EventControllerContext; +import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.StateControllerContext; +import org.jboss.portal.portlet.info.PortletInfo; +import org.jboss.portal.portlet.invocation.ActionInvocation; +import org.jboss.portal.portlet.invocation.EventInvocation; +import org.jboss.portal.portlet.invocation.ResourceInvocation; +import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.spi.PortletInvocationContext; +import org.jboss.portal.presentation.impl.state.structural.PageNode; + +import javax.servlet.http.Cookie; +import java.util.List; + +/** + * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public class StructuralPortletControllerContext implements PortletControllerContext +{ + + /** . */ + private final PageNode page; + + /** . */ + private final PortletInvoker invoker; + + public StructuralPortletControllerContext(PageNode page, PortletInvoker invoker) + { + this.page = page; + this.invoker = invoker; + } + + public PortletInfo getPortletInfo(String windowId) + { + return null; + } + + public PortletInvocationContext createPortletInvocationContext(String windowId, PageNavigationalState pageNavigationalState) + { + return null; + } + + public PortletInvocationResponse invoke(ActionInvocation actionInvocation) throws PortletInvokerException + { + return null; + } + + public PortletInvocationResponse invoke(List<Cookie> requestCookies, EventInvocation eventInvocation) throws PortletInvokerException + { + return null; + } + + public PortletInvocationResponse invoke(ResourceInvocation resourceInvocation) throws PortletInvokerException + { + return null; + } + + public EventControllerContext getEventControllerContext() + { + return null; + } + + public StateControllerContext getStateControllerContext() + { + return null; + } +} Copied: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/spi (from rev 10648, modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/spi) Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/spi/PresentationClientContext.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/spi/PresentationClientContext.java 2008-04-18 21:20:50 UTC (rev 10648) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/spi/PresentationClientContext.java 2008-04-18 22:06:26 UTC (rev 10649) @@ -20,7 +20,7 @@ * 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.portlet.spi; +package org.jboss.portal.presentation.impl.server.portlet.spi; import org.jboss.portal.common.util.MultiValuedPropertyMap; import org.jboss.portal.common.util.SimpleMultiValuedPropertyMap; Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/spi/PresentationInstanceContext.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/spi/PresentationInstanceContext.java 2008-04-18 21:20:50 UTC (rev 10648) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/spi/PresentationInstanceContext.java 2008-04-18 22:06:26 UTC (rev 10649) @@ -20,7 +20,7 @@ * 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.portlet.spi; +package org.jboss.portal.presentation.impl.server.portlet.spi; import org.jboss.portal.portlet.StateEvent; import org.jboss.portal.portlet.spi.InstanceContext; Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/spi/PresentationPortalContext.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/spi/PresentationPortalContext.java 2008-04-18 21:20:50 UTC (rev 10648) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/spi/PresentationPortalContext.java 2008-04-18 22:06:26 UTC (rev 10649) @@ -20,7 +20,7 @@ * 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.portlet.spi; +package org.jboss.portal.presentation.impl.server.portlet.spi; import org.jboss.portal.Mode; import org.jboss.portal.WindowState; Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/spi/PresentationServerContext.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/spi/PresentationServerContext.java 2008-04-18 21:20:50 UTC (rev 10648) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/spi/PresentationServerContext.java 2008-04-18 22:06:26 UTC (rev 10649) @@ -20,7 +20,7 @@ * 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.portlet.spi; +package org.jboss.portal.presentation.impl.server.portlet.spi; import org.jboss.portal.portlet.spi.ServerContext; import org.jboss.portal.presentation.client.PresentationClient; Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/spi/PresentationWindowContext.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/spi/PresentationWindowContext.java 2008-04-18 21:20:50 UTC (rev 10648) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/spi/PresentationWindowContext.java 2008-04-18 22:06:26 UTC (rev 10649) @@ -20,7 +20,7 @@ * 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.portlet.spi; +package org.jboss.portal.presentation.impl.server.portlet.spi; import org.jboss.portal.portlet.spi.WindowContext; import org.jboss.portal.presentation.impl.state.structural.WindowNode;