[portal-commits] JBoss Portal SVN: r10070 - in modules/portlet/trunk: portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet and 6 other directories.

Author: julien(a)jboss.com Date: 2008-02-21 17:27:47 -0500 (Thu, 21 Feb 2008) New Revision: 10070 Modified: modules/portlet/trunk/bridge/src/main/java/org/jboss/portal/portlet/bridge/JBossServletContextProvider.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/PortletApplication.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/PortletContainer.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/PortletContainerInvoker.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/PortletFilter.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/object/PortletApplicationObject.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/object/PortletContainerObject.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/object/PortletFilterObject.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/container/PortletApplicationLifeCycle.java 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/PortletContainerImpl.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletFilterImpl.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletRequestAttributes.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/BaseURLImpl.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestDispatcherImpl.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestImpl.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/StateAwareResponseImpl.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/container/PortletApplicationObjectSupport.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/container/PortletContainerObjectSupport.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/container/PortletFilterObjectSupport.java Log: correct minor consistency in the model Modified: modules/portlet/trunk/bridge/src/main/java/org/jboss/portal/portlet/bridge/JBossServletContextProvider.java =================================================================== --- modules/portlet/trunk/bridge/src/main/java/org/jboss/portal/portlet/bridge/JBossServletContextProvider.java 2008-02-21 22:21:37 UTC (rev 10069) +++ modules/portlet/trunk/bridge/src/main/java/org/jboss/portal/portlet/bridge/JBossServletContextProvider.java 2008-02-21 22:27:47 UTC (rev 10070) @@ -126,7 +126,7 @@ // this.invocation = invocation; - this.ctx = container.getApplication().getContext().getServletContext(); + this.ctx = container.getPortletApplication().getContext().getServletContext(); this.breq = null; this.bresp = null; } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java 2008-02-21 22:21:37 UTC (rev 10069) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java 2008-02-21 22:27:47 UTC (rev 10070) @@ -67,7 +67,7 @@ protected Object invoke(PortletInvocation invocation) throws Exception, InvocationException { PortletContainer container = (PortletContainer)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, PortletContainerInvoker.PORTLET_CONTAINER); - PortletApplication portletApplication = container.getApplication(); + PortletApplication portletApplication = container.getPortletApplication(); ServerContext reqCtx = invocation.getServerContext(); ServletContext targetCtx = portletApplication.getContext().getServletContext(); ServletContainer servletContainer = servletContainerFactory.getServletContainer(); Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/PortletApplication.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/PortletApplication.java 2008-02-21 22:21:37 UTC (rev 10069) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/PortletApplication.java 2008-02-21 22:27:47 UTC (rev 10070) @@ -55,6 +55,11 @@ */ PortletContainer getPortletContainer(String containerId); + /** + * Returns the context of the portlet application. + * + * @return the context + */ PortletApplicationContext getContext(); Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/PortletContainer.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/PortletContainer.java 2008-02-21 22:21:37 UTC (rev 10069) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/PortletContainer.java 2008-02-21 22:27:47 UTC (rev 10070) @@ -64,7 +64,12 @@ * * @return the application */ - PortletApplication getApplication(); + PortletApplication getPortletApplication(); + /** + * Returns the context of the portlet container. + * + * @return the context + */ PortletContainerContext getContext(); } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/PortletContainerInvoker.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/PortletContainerInvoker.java 2008-02-21 22:21:37 UTC (rev 10069) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/PortletContainerInvoker.java 2008-02-21 22:27:47 UTC (rev 10070) @@ -254,7 +254,7 @@ public PortletImpl(PortletContainer container) { this.container = container; - this.context = PortletContext.createPortletContext(container.getApplication().getId() + "." + container.getId()); + this.context = PortletContext.createPortletContext(container.getPortletApplication().getId() + "." + container.getId()); } public PortletContext getContext() Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/PortletFilter.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/PortletFilter.java 2008-02-21 22:21:37 UTC (rev 10069) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/PortletFilter.java 2008-02-21 22:27:47 UTC (rev 10070) @@ -36,4 +36,17 @@ */ String getId(); + /** + * Returns the wired application. + * + * @return the application + */ + PortletApplication getPortletApplication(); + + /** + * Returns the context of the portlet filter + * + * @return the context + */ + PortletFilterContext getContext(); } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/object/PortletApplicationObject.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/object/PortletApplicationObject.java 2008-02-21 22:21:37 UTC (rev 10069) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/object/PortletApplicationObject.java 2008-02-21 22:27:47 UTC (rev 10070) @@ -55,28 +55,28 @@ * * @param container the container */ - void addContainer(PortletContainer container); + void addPortletContainer(PortletContainer container); /** * Remove a container. * * @param container the container */ - void removeContainer(PortletContainer container); + void removePortletContainer(PortletContainer container); /** * Add a filter. * * @param filter the filter */ - void addFilter(PortletFilter filter); + void addPortletFilter(PortletFilter filter); /** * Remove a filter. * * @param filter the filter */ - void removeFilter(PortletFilter filter); + void removePortletFilter(PortletFilter filter); /** * Starts the application only. It does not take care of starting its components. Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/object/PortletContainerObject.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/object/PortletContainerObject.java 2008-02-21 22:21:37 UTC (rev 10069) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/object/PortletContainerObject.java 2008-02-21 22:27:47 UTC (rev 10070) @@ -41,7 +41,7 @@ * * @param application the related application */ - void setApplication(PortletApplication application); + void setPortletApplication(PortletApplication application); /** * Set/unset the portlet container context. @@ -55,14 +55,14 @@ * * @param filter the portlet filter */ - void addFilter(PortletFilter filter); + void addPortletFilter(PortletFilter filter); /** * Remove a filter. * * @param filter the portlet filter */ - void removeFilter(PortletFilter filter); + void removePortletFilter(PortletFilter filter); /** * Starts the portlet container. Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/object/PortletFilterObject.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/object/PortletFilterObject.java 2008-02-21 22:21:37 UTC (rev 10069) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/object/PortletFilterObject.java 2008-02-21 22:27:47 UTC (rev 10070) @@ -38,7 +38,7 @@ * * @param application the application */ - void setApplication(PortletApplication application); + void setPortletApplication(PortletApplication application); /** * Set the context required by that filter. Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/container/PortletApplicationLifeCycle.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/container/PortletApplicationLifeCycle.java 2008-02-21 22:21:37 UTC (rev 10069) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/container/PortletApplicationLifeCycle.java 2008-02-21 22:27:47 UTC (rev 10070) @@ -103,8 +103,8 @@ for (PortletFilterLifeCycle portletFilterLifeCycle : portletFilterLifeCycles.values()) { portletFilterLifeCycle.portletFilter.setContext(portletFilterLifeCycle.portletFilterContext); - portletFilterLifeCycle.portletFilter.setApplication(portletApplication); - portletApplication.addFilter(portletFilterLifeCycle.portletFilter); + portletFilterLifeCycle.portletFilter.setPortletApplication(portletApplication); + portletApplication.addPortletFilter(portletFilterLifeCycle.portletFilter); // listener.onEvent(new ManagedObjectAddedEvent(portletFilterLifeCycle)); @@ -114,8 +114,8 @@ for (PortletContainerLifeCycle portletContainerLifeCycle : portletContainerLifeCycles.values()) { portletContainerLifeCycle.portletContainer.setContext(portletContainerLifeCycle.portletContainerContext); - portletContainerLifeCycle.portletContainer.setApplication(portletApplication); - portletApplication.addContainer(portletContainerLifeCycle.portletContainer); + portletContainerLifeCycle.portletContainer.setPortletApplication(portletApplication); + portletApplication.addPortletContainer(portletContainerLifeCycle.portletContainer); // listener.onEvent(new ManagedObjectAddedEvent(portletContainerLifeCycle)); @@ -126,7 +126,7 @@ { for (PortletContainerLifeCycle portletContainerLifeCycle : entry.getValue()) { - portletContainerLifeCycle.portletContainer.addFilter(entry.getKey().portletFilter); + portletContainerLifeCycle.portletContainer.addPortletFilter(entry.getKey().portletFilter); } } @@ -148,7 +148,7 @@ { for (PortletContainerLifeCycle portletContainerLifeCycle : entry.getValue()) { - portletContainerLifeCycle.portletContainer.removeFilter(entry.getKey().portletFilter); + portletContainerLifeCycle.portletContainer.removePortletFilter(entry.getKey().portletFilter); } } @@ -157,8 +157,8 @@ listener.onEvent(new ManagedObjectRemovedEvent(portletContainerLifeCycle)); // - portletApplication.removeContainer(portletContainerLifeCycle.portletContainer); - portletContainerLifeCycle.portletContainer.setApplication(null); + portletApplication.removePortletContainer(portletContainerLifeCycle.portletContainer); + portletContainerLifeCycle.portletContainer.setPortletApplication(null); portletContainerLifeCycle.portletContainer.setContext(null); } @@ -168,8 +168,8 @@ listener.onEvent(new ManagedObjectRemovedEvent(portletFilterLifeCycle)); // - portletApplication.removeFilter(portletFilterLifeCycle.portletFilter); - portletFilterLifeCycle.portletFilter.setApplication(null); + portletApplication.removePortletFilter(portletFilterLifeCycle.portletFilter); + portletFilterLifeCycle.portletFilter.setPortletApplication(null); portletFilterLifeCycle.portletFilter.setContext(null); } } 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 22:21:37 UTC (rev 10069) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletApplicationImpl.java 2008-02-21 22:27:47 UTC (rev 10070) @@ -112,12 +112,12 @@ return metaData.getId(); } - public void addFilter(org.jboss.portal.portlet.container.PortletFilter filter) + public void addPortletFilter(org.jboss.portal.portlet.container.PortletFilter filter) { } - public void removeFilter(org.jboss.portal.portlet.container.PortletFilter filter) + public void removePortletFilter(org.jboss.portal.portlet.container.PortletFilter filter) { } @@ -142,12 +142,12 @@ return jbossMetaData; } - public void addContainer(PortletContainer container) + public void addPortletContainer(PortletContainer container) { portlets.put(container.getId(), container); } - public void removeContainer(PortletContainer container) + public void removePortletContainer(PortletContainer container) { portlets.remove(container.getId()); } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletContainerImpl.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletContainerImpl.java 2008-02-21 22:21:37 UTC (rev 10069) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletContainerImpl.java 2008-02-21 22:27:47 UTC (rev 10070) @@ -190,12 +190,12 @@ return info.getName(); } - public void addFilter(org.jboss.portal.portlet.container.PortletFilter filter) + public void addPortletFilter(org.jboss.portal.portlet.container.PortletFilter filter) { filters.add((PortletFilterImpl)filter); } - public void removeFilter(org.jboss.portal.portlet.container.PortletFilter filter) + public void removePortletFilter(org.jboss.portal.portlet.container.PortletFilter filter) { filters.remove((PortletFilterImpl)filter); } @@ -380,12 +380,12 @@ } // Cannot use covariant here as it will break the javabean property getter convention used by MC. - public PortletApplication getApplication() + public PortletApplication getPortletApplication() { return application; } - public void setApplication(PortletApplication application) + public void setPortletApplication(PortletApplication application) { this.application = (PortletApplicationImpl)application; } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletFilterImpl.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletFilterImpl.java 2008-02-21 22:21:37 UTC (rev 10069) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletFilterImpl.java 2008-02-21 22:27:47 UTC (rev 10070) @@ -104,16 +104,26 @@ return null; } - public void setApplication(PortletApplication application) + public void setPortletApplication(PortletApplication application) { this.application = (PortletApplicationImpl)application; } + public PortletApplication getPortletApplication() + { + return application; + } + public void setContext(PortletFilterContext context) { this.context = context; } + public PortletFilterContext getContext() + { + return context; + } + public void start() throws Exception { PortletContext portletContext = application.portletContext; Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletRequestAttributes.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletRequestAttributes.java 2008-02-21 22:21:37 UTC (rev 10069) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletRequestAttributes.java 2008-02-21 22:27:47 UTC (rev 10070) @@ -105,7 +105,7 @@ if (infos != null) { // Get portlet application metadata - PortletApplicationImpl portletApp = (PortletApplicationImpl)container.getApplication(); + PortletApplicationImpl portletApp = (PortletApplicationImpl)container.getPortletApplication(); PortletApplication10MetaData pamd = portletApp.getMetaData(); Map<String, UserAttributeMetaData> uaMD = pamd.getUserAttributes(); Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/BaseURLImpl.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/BaseURLImpl.java 2008-02-21 22:21:37 UTC (rev 10069) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/BaseURLImpl.java 2008-02-21 22:27:47 UTC (rev 10070) @@ -25,7 +25,6 @@ import org.jboss.portal.portlet.invocation.PortletInvocation; import org.jboss.portal.portlet.spi.PortletInvocationContext; import org.jboss.portal.portlet.impl.jsr168.PortletApplicationImpl; -import org.jboss.portal.common.NotYetImplemented; import org.jboss.portal.common.io.WriterCharWriter; import org.jboss.portal.common.text.EntityEncoder; @@ -142,7 +141,7 @@ public String toString() { - PortletURLGenerationListener listener = ((PortletApplicationImpl)preq.container.getApplication()).getListener(PortletURLGenerationListener.class); + PortletURLGenerationListener listener = ((PortletApplicationImpl)preq.container.getPortletApplication()).getListener(PortletURLGenerationListener.class); // InternalContainerURL url; Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestDispatcherImpl.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestDispatcherImpl.java 2008-02-21 22:21:37 UTC (rev 10069) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestDispatcherImpl.java 2008-02-21 22:27:47 UTC (rev 10070) @@ -101,7 +101,7 @@ // try { - PortletApplication application = req.container.getApplication(); + PortletApplication application = req.container.getPortletApplication(); PortletApplicationContext applicationContext = application.getContext(); ServletContext servletContext = applicationContext.getServletContext(); Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestImpl.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestImpl.java 2008-02-21 22:21:37 UTC (rev 10069) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestImpl.java 2008-02-21 22:27:47 UTC (rev 10070) @@ -28,7 +28,6 @@ import org.jboss.portal.common.util.MultiValuedPropertyMap; import org.jboss.portal.common.util.SimpleMultiValuedPropertyMap; import org.jboss.portal.common.util.ContentInfo; -import org.jboss.portal.portlet.container.PortletContainerInvoker; import org.jboss.portal.portlet.impl.jsr168.PortletApplicationImpl; import org.jboss.portal.portlet.impl.jsr168.PortletContainerImpl; import org.jboss.portal.portlet.impl.jsr168.PortletUtils; @@ -428,7 +427,7 @@ { // For sure we need a session we will obtain a valid one HttpSession hsession = realReq.getSession(); - PortletApplicationImpl portletApp = (PortletApplicationImpl)container.getApplication(); + PortletApplicationImpl portletApp = (PortletApplicationImpl)container.getPortletApplication(); psession = new PortletSessionImpl(hsession, windowContext.getId(), portletApp.getPortletContext()); } else @@ -439,7 +438,7 @@ // if (hsession != null) { - PortletApplicationImpl portletApp = (PortletApplicationImpl)container.getApplication(); + PortletApplicationImpl portletApp = (PortletApplicationImpl)container.getPortletApplication(); psession = new PortletSessionImpl(hsession, windowContext.getId(), portletApp.getPortletContext()); } } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/StateAwareResponseImpl.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/StateAwareResponseImpl.java 2008-02-21 22:21:37 UTC (rev 10069) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/StateAwareResponseImpl.java 2008-02-21 22:27:47 UTC (rev 10070) @@ -320,7 +320,7 @@ } // - ContainerPortletApplicationInfo info = ((PortletApplicationImpl)preq.container.getApplication()).getInfo(); + ContainerPortletApplicationInfo info = ((PortletApplicationImpl)preq.container.getPortletApplication()).getInfo(); QName name = new QName(info.getDefaultNamespace(), localName); setEvent(name, value); } Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/container/PortletApplicationObjectSupport.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/container/PortletApplicationObjectSupport.java 2008-02-21 22:21:37 UTC (rev 10069) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/container/PortletApplicationObjectSupport.java 2008-02-21 22:27:47 UTC (rev 10070) @@ -59,7 +59,7 @@ throw new UnsupportedOperationException(); } - public void addContainer(PortletContainer container) + public void addPortletContainer(PortletContainer container) { if (container == null) { @@ -72,7 +72,7 @@ containers.put(container.getId(), container); } - public void removeContainer(PortletContainer container) + public void removePortletContainer(PortletContainer container) { if (container == null) { @@ -85,7 +85,7 @@ containers.remove(container.getId()); } - public void addFilter(PortletFilter filter) + public void addPortletFilter(PortletFilter filter) { if (filter == null) { @@ -98,7 +98,7 @@ filters.put(filter.getId(), filter); } - public void removeFilter(PortletFilter filter) + public void removePortletFilter(PortletFilter filter) { if (filter == null) { Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/container/PortletContainerObjectSupport.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/container/PortletContainerObjectSupport.java 2008-02-21 22:21:37 UTC (rev 10069) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/container/PortletContainerObjectSupport.java 2008-02-21 22:27:47 UTC (rev 10070) @@ -53,7 +53,7 @@ super(id); } - public void setApplication(PortletApplication application) + public void setPortletApplication(PortletApplication application) { this.application = application; } @@ -63,7 +63,7 @@ this.context = context; } - public void addFilter(PortletFilter filter) + public void addPortletFilter(PortletFilter filter) { if (filter == null) { @@ -76,7 +76,7 @@ filters.put(filter.getId(), filter); } - public void removeFilter(PortletFilter filter) + public void removePortletFilter(PortletFilter filter) { if (filter == null) { @@ -99,7 +99,7 @@ throw new UnsupportedOperationException(); } - public PortletApplication getApplication() + public PortletApplication getPortletApplication() { throw new UnsupportedOperationException(); } Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/container/PortletFilterObjectSupport.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/container/PortletFilterObjectSupport.java 2008-02-21 22:21:37 UTC (rev 10069) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/container/PortletFilterObjectSupport.java 2008-02-21 22:27:47 UTC (rev 10070) @@ -42,13 +42,24 @@ super(id); } - public void setApplication(PortletApplication application) + public void setPortletApplication(PortletApplication application) { this.application = application; } + public PortletApplication getPortletApplication() + { + return application; + } + public void setContext(PortletFilterContext context) { this.context = context; } + + public PortletFilterContext getContext() + { + return context; + } + }