Author: julien(a)jboss.com Date: 2008-02-21 19:12:06 -0500 (Thu, 21 Feb 2008) New Revision: 10073 Removed: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletAPIFactoryImpl.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/spi/PortletAPIFactory.java Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletApplicationImpl.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletApplicationDeployment.java modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans.xml modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/jboss-beans.xml Log: - remote PortletAPIFactory Deleted: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletAPIFactoryImpl.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletAPIFactoryImpl.java 2008-02-21 23:41:05 UTC (rev 10072) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletAPIFactoryImpl.java 2008-02-22 00:12:06 UTC (rev 10073) @@ -1,84 +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.portlet.impl.jsr168; - -import org.jboss.portal.portlet.invocation.ActionInvocation; -import org.jboss.portal.portlet.invocation.RenderInvocation; -import org.jboss.portal.portlet.invocation.EventInvocation; -import org.jboss.portal.portlet.invocation.ResourceInvocation; -import org.jboss.portal.portlet.impl.jsr168.api.ActionResponseImpl; -import org.jboss.portal.portlet.impl.jsr168.api.ActionRequestImpl; -import org.jboss.portal.portlet.impl.jsr168.api.RenderRequestImpl; -import org.jboss.portal.portlet.impl.jsr168.api.RenderResponseImpl; -import org.jboss.portal.portlet.impl.jsr168.api.EventRequestImpl; -import org.jboss.portal.portlet.impl.jsr168.api.EventResponseImpl; -import org.jboss.portal.portlet.impl.jsr168.api.ResourceRequestImpl; -import org.jboss.portal.portlet.impl.jsr168.api.ResourceResponseImpl; -import org.jboss.portal.portlet.impl.jsr168.spi.PortletAPIFactory; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 7226 $ - */ -public class PortletAPIFactoryImpl implements PortletAPIFactory -{ - public ActionRequestImpl createActionRequest(ActionInvocation invocation) - { - return new ActionRequestImpl(null, invocation); - } - - public ActionResponseImpl createActionResponse(ActionInvocation invocation, ActionRequestImpl actionRequest) - { - return new ActionResponseImpl(invocation, actionRequest); - } - - public EventRequestImpl createEventRequest(EventInvocation invocation) - { - return new EventRequestImpl(null, invocation); - } - - public EventResponseImpl createEventResponse(EventInvocation invocation, EventRequestImpl eventRequest) - { - return new EventResponseImpl(invocation, eventRequest); - } - - public RenderRequestImpl createRenderRequest(RenderInvocation invocation) - { - return new RenderRequestImpl(null, invocation); - } - - public RenderResponseImpl createRenderResponse(RenderInvocation invocation, RenderRequestImpl renderRequest) - { - return new RenderResponseImpl(invocation, renderRequest); - } - - public ResourceRequestImpl createResourceRequest(ResourceInvocation invocation) - { - return new ResourceRequestImpl(null, invocation); - } - - public ResourceResponseImpl createResourceResponse(ResourceInvocation invocation, ResourceRequestImpl renderRequest) - { - return new ResourceResponseImpl(invocation, renderRequest); - } -} Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletApplicationImpl.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletApplicationImpl.java 2008-02-21 23:41:05 UTC (rev 10072) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletApplicationImpl.java 2008-02-22 00:12:06 UTC (rev 10073) @@ -25,7 +25,6 @@ import org.jboss.portal.portlet.impl.jsr168.api.PortletContextImpl; import org.jboss.portal.portlet.impl.jsr168.api.PortletURLGenerationListenerChain; import org.jboss.portal.portlet.impl.jsr168.api.FilterConfigImpl; -import org.jboss.portal.portlet.impl.jsr168.spi.PortletAPIFactory; import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData; import org.jboss.portal.portlet.impl.info.ContainerPortletApplicationInfo; import org.jboss.portal.portlet.impl.info.ContainerListenerInfo; @@ -65,9 +64,6 @@ protected final JBossApplicationMetaData jbossMetaData; /** . */ - protected final PortletAPIFactory portletAPIFactory; - - /** . */ protected PortletApplicationContext context; /** Logger. */ @@ -91,13 +87,11 @@ public PortletApplicationImpl( ContainerPortletApplicationInfo info, PortletApplication10MetaData metaData, - JBossApplicationMetaData jbossMetaData, - PortletAPIFactory portletAPIFactory) + JBossApplicationMetaData jbossMetaData) { this.info = info; this.metaData = metaData; this.jbossMetaData = jbossMetaData; - this.portletAPIFactory = portletAPIFactory; this.portlets = new LinkedHashMap<String, PortletContainer>(); this.log = Logger.getLogger(PortletApplication.class); } @@ -127,11 +121,6 @@ return info; } - public PortletAPIFactory getPortletAPIFactory() - { - return portletAPIFactory; - } - public PortletApplication10MetaData getMetaData() { return metaData; Deleted: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/spi/PortletAPIFactory.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/spi/PortletAPIFactory.java 2008-02-21 23:41:05 UTC (rev 10072) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/spi/PortletAPIFactory.java 2008-02-22 00:12:06 UTC (rev 10073) @@ -1,77 +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.portlet.impl.jsr168.spi; - -import org.jboss.portal.portlet.invocation.ActionInvocation; -import org.jboss.portal.portlet.invocation.RenderInvocation; -import org.jboss.portal.portlet.invocation.EventInvocation; -import org.jboss.portal.portlet.invocation.ResourceInvocation; -import org.jboss.portal.portlet.impl.jsr168.api.RenderRequestImpl; -import org.jboss.portal.portlet.impl.jsr168.api.ActionRequestImpl; -import org.jboss.portal.portlet.impl.jsr168.api.ActionResponseImpl; -import org.jboss.portal.portlet.impl.jsr168.api.RenderResponseImpl; -import org.jboss.portal.portlet.impl.jsr168.api.EventRequestImpl; -import org.jboss.portal.portlet.impl.jsr168.api.EventResponseImpl; -import org.jboss.portal.portlet.impl.jsr168.api.ResourceRequestImpl; -import org.jboss.portal.portlet.impl.jsr168.api.ResourceResponseImpl; - -/** - * Factory for portlet API implementation. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 7226 $ - */ -public interface PortletAPIFactory -{ - /** - */ - ActionRequestImpl createActionRequest(ActionInvocation invocation); - - /** - */ - ActionResponseImpl createActionResponse(ActionInvocation invocation, ActionRequestImpl actionRequest); - - /** - */ - EventRequestImpl createEventRequest(EventInvocation invocation); - - /** - */ - EventResponseImpl createEventResponse(EventInvocation invocation, EventRequestImpl eventRequest); - - /** - */ - RenderRequestImpl createRenderRequest(RenderInvocation invocation); - - /** - */ - RenderResponseImpl createRenderResponse(RenderInvocation invocation, RenderRequestImpl renderRequest); - - /** - */ - ResourceRequestImpl createResourceRequest(ResourceInvocation invocation); - - /** - */ - ResourceResponseImpl createResourceResponse(ResourceInvocation invocation, ResourceRequestImpl renderRequest); -} Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletApplicationDeployment.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletApplicationDeployment.java 2008-02-21 23:41:05 UTC (rev 10072) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletApplicationDeployment.java 2008-02-22 00:12:06 UTC (rev 10073) @@ -31,7 +31,6 @@ import org.jboss.portal.portlet.impl.jsr168.PortletApplicationImpl; import org.jboss.portal.portlet.impl.jsr168.PortletContainerImpl; import org.jboss.portal.portlet.impl.jsr168.PortletFilterImpl; -import org.jboss.portal.portlet.impl.jsr168.PortletAPIFactoryImpl; import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData; import org.jboss.portal.portlet.impl.container.PortletApplicationLifeCycle; import org.jboss.portal.portlet.impl.container.PortletFilterLifeCycle; @@ -96,7 +95,9 @@ // PortletApplicationObject portletApplicationObject = new PortletApplicationImpl( - builder.getApplication(), metaData, new JBossApplicationMetaData(), new PortletAPIFactoryImpl()); + builder.getApplication(), + metaData, + new JBossApplicationMetaData()); PortletApplicationContext portletApplicationContext = new PortletApplicationContextImpl(webApp); Modified: modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans.xml 2008-02-21 23:41:05 UTC (rev 10072) +++ modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans.xml 2008-02-22 00:12:06 UTC (rev 10073) @@ -40,8 +40,6 @@ <property name="portletContainerInvoker"><inject bean="PortletContainerInvoker"/></property> </bean> - <bean name="PortletAPIFactory" class="org.jboss.portal.portlet.impl.jsr168.PortletAPIFactoryImpl"/> - <!-- The ServletContainerFactory --> <bean name="ServletContainerFactory" class="org.jboss.portal.web.impl.DefaultServletContainerFactory"> <constructor factoryClass="org.jboss.portal.web.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/> Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/jboss-beans.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/jboss-beans.xml 2008-02-21 23:41:05 UTC (rev 10072) +++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/jboss-beans.xml 2008-02-22 00:12:06 UTC (rev 10073) @@ -28,8 +28,6 @@ <property name="portletContainerInvoker"><inject bean="PortletContainerInvoker"/></property> </bean> - <bean name="PortletAPIFactory" class="org.jboss.portal.portlet.impl.jsr168.PortletAPIFactoryImpl"/> - <!-- The ServletContainerFactory --> <bean name="ServletContainerFactory" class="org.jboss.portal.web.impl.DefaultServletContainerFactory"> <constructor factoryClass="org.jboss.portal.web.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/>