Return-Path: Delivered-To: apmail-incubator-sling-commits-archive@minotaur.apache.org Received: (qmail 73734 invoked from network); 5 May 2009 06:21:40 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 5 May 2009 06:21:40 -0000 Received: (qmail 34033 invoked by uid 500); 5 May 2009 06:21:40 -0000 Delivered-To: apmail-incubator-sling-commits-archive@incubator.apache.org Received: (qmail 33978 invoked by uid 500); 5 May 2009 06:21:40 -0000 Mailing-List: contact sling-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: sling-dev@incubator.apache.org Delivered-To: mailing list sling-commits@incubator.apache.org Received: (qmail 33962 invoked by uid 99); 5 May 2009 06:21:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 May 2009 06:21:40 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 May 2009 06:21:38 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B14A8238889E; Tue, 5 May 2009 06:21:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r771578 - in /incubator/sling/whiteboard/portal/container: ./ src/main/java/org/apache/sling/portal/container/internal/ src/main/java/org/apache/sling/portal/container/internal/impl/ src/main/java/org/apache/sling/portal/container/internal/... Date: Tue, 05 May 2009 06:21:18 -0000 To: sling-commits@incubator.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090505062118.B14A8238889E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Tue May 5 06:21:18 2009 New Revision: 771578 URL: http://svn.apache.org/viewvc?rev=771578&view=rev Log: Use latest Pluto (new group id, changed services, changed logger) Modified: incubator/sling/whiteboard/portal/container/pom.xml incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/ContainerServicesImpl.java incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/impl/SlingPortletConfigImpl.java incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/impl/SlingPortletContextImpl.java incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/services/DefaultPortletRegistryService.java incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/services/FilterManagerServiceImpl.java Modified: incubator/sling/whiteboard/portal/container/pom.xml URL: http://svn.apache.org/viewvc/incubator/sling/whiteboard/portal/container/pom.xml?rev=771578&r1=771577&r2=771578&view=diff ============================================================================== --- incubator/sling/whiteboard/portal/container/pom.xml (original) +++ incubator/sling/whiteboard/portal/container/pom.xml Tue May 5 06:21:18 2009 @@ -163,13 +163,13 @@ - org.apache.pluto + org.apache.portals.pluto pluto-container-api 2.0.0-SNAPSHOT provided - org.apache.pluto + org.apache.portals.pluto pluto-container 2.0.0-SNAPSHOT provided Modified: incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/ContainerServicesImpl.java URL: http://svn.apache.org/viewvc/incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/ContainerServicesImpl.java?rev=771578&r1=771577&r2=771578&view=diff ============================================================================== --- incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/ContainerServicesImpl.java (original) +++ incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/ContainerServicesImpl.java Tue May 5 06:21:18 2009 @@ -28,8 +28,10 @@ import org.apache.pluto.container.PortletPreferencesService; import org.apache.pluto.container.PortletRequestContextService; import org.apache.pluto.container.PortletURLListenerService; +import org.apache.pluto.container.RequestDispatcherService; import org.apache.pluto.container.UserInfoService; import org.apache.pluto.container.impl.PortletEnvironmentServiceImpl; +import org.apache.pluto.container.impl.RequestDispatcherServiceImpl; import org.apache.sling.jcr.api.SlingRepository; import org.apache.sling.portal.container.PortletRegistryService; import org.apache.sling.portal.container.PortletWindowManager; @@ -56,6 +58,7 @@ private final PortletEnvironmentService portletEnvironmentService; private final UserInfoService userInfoService; private final NamespaceMapper namespaceMapper; + private final RequestDispatcherService rds = new RequestDispatcherServiceImpl(2); /** * Sling container services @@ -71,7 +74,7 @@ boolean noErrors = false; try { this.context = context; - this.registry = new DefaultPortletRegistryService(info); + this.registry = new DefaultPortletRegistryService(info, this.rds); this.eventCoordinationService = new EventCoordinationServiceImpl(); this.portletRequestContextService = new PortletRequestContextServiceImpl(); this.filterManagerService = new FilterManagerServiceImpl(this.registry); @@ -190,4 +193,8 @@ public PortletWindowManager getPortletWindowManager() { return this.windowManager; } + + public RequestDispatcherService getRequestDispatcherService() { + return this.rds; + } } Modified: incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/impl/SlingPortletConfigImpl.java URL: http://svn.apache.org/viewvc/incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/impl/SlingPortletConfigImpl.java?rev=771578&r1=771577&r2=771578&view=diff ============================================================================== --- incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/impl/SlingPortletConfigImpl.java (original) +++ incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/impl/SlingPortletConfigImpl.java Tue May 5 06:21:18 2009 @@ -21,12 +21,12 @@ import javax.portlet.PortletContext; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.pluto.container.impl.AbstractPortletConfigImpl; import org.apache.pluto.container.om.portlet.PortletDefinition; import org.apache.sling.portal.container.SlingPortletConfig; import org.apache.sling.portal.container.internal.ResourceBundleFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Implementation of the portlet config. @@ -35,7 +35,7 @@ extends AbstractPortletConfigImpl implements SlingPortletConfig { - private static final Log LOG = LogFactory.getLog(SlingPortletConfigImpl.class); + private static final Logger LOG = LoggerFactory.getLogger(SlingPortletConfigImpl.class); protected ResourceBundleFactory bundles; Modified: incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/impl/SlingPortletContextImpl.java URL: http://svn.apache.org/viewvc/incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/impl/SlingPortletContextImpl.java?rev=771578&r1=771577&r2=771578&view=diff ============================================================================== --- incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/impl/SlingPortletContextImpl.java (original) +++ incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/impl/SlingPortletContextImpl.java Tue May 5 06:21:18 2009 @@ -21,6 +21,7 @@ import javax.servlet.ServletContext; import org.apache.pluto.container.ContainerInfo; +import org.apache.pluto.container.RequestDispatcherService; import org.apache.pluto.container.impl.PortletContextImpl; import org.apache.pluto.container.om.portlet.PortletApplicationDefinition; import org.apache.sling.portal.container.SlingPortletContext; @@ -43,8 +44,9 @@ public SlingPortletContextImpl(ServletContext servletContext, PortletApplicationDefinition portletApp, ClassLoader contextClassLoader, - ContainerInfo info) { - super(servletContext, portletApp, info, new ArrayList()); + ContainerInfo info, + RequestDispatcherService rds) { + super(servletContext, portletApp, info, new ArrayList(), rds); this.contextClassLoader = contextClassLoader; } Modified: incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/services/DefaultPortletRegistryService.java URL: http://svn.apache.org/viewvc/incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/services/DefaultPortletRegistryService.java?rev=771578&r1=771577&r2=771578&view=diff ============================================================================== --- incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/services/DefaultPortletRegistryService.java (original) +++ incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/services/DefaultPortletRegistryService.java Tue May 5 06:21:18 2009 @@ -30,6 +30,7 @@ import org.apache.pluto.container.ContainerInfo; import org.apache.pluto.container.PortletAppDescriptorService; import org.apache.pluto.container.PortletContainerException; +import org.apache.pluto.container.RequestDispatcherService; import org.apache.pluto.container.impl.PortletAppDescriptorServiceImpl; import org.apache.pluto.container.om.portlet.PortletApplicationDefinition; import org.apache.pluto.container.om.portlet.PortletDefinition; @@ -84,10 +85,15 @@ */ private final Map portlets = new HashMap(); + /** The container info. */ private final ContainerInfo containerInfo; - public DefaultPortletRegistryService(final ContainerInfo info) { + /** The request dispatcher service. */ + private final RequestDispatcherService requestDispatcherService; + + public DefaultPortletRegistryService(final ContainerInfo info, final RequestDispatcherService rds) { this.containerInfo = info; + this.requestDispatcherService = rds; } /** @@ -103,7 +109,7 @@ final PortletApplicationDefinition portletApp = this.createDefinition(servletContext, applicationName, contextPath); // create portlet context - final SlingPortletContext portletContext = new SlingPortletContextImpl(servletContext, portletApp, callback.getClassLoader(), this.containerInfo); + final SlingPortletContext portletContext = new SlingPortletContextImpl(servletContext, portletApp, callback.getClassLoader(), this.containerInfo, this.requestDispatcherService); final String appName = portletContext.getApplicationName(); if (appName == null) { throw new PortletContainerException("Portlet application name should not be null."); Modified: incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/services/FilterManagerServiceImpl.java URL: http://svn.apache.org/viewvc/incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/services/FilterManagerServiceImpl.java?rev=771578&r1=771577&r2=771578&view=diff ============================================================================== --- incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/services/FilterManagerServiceImpl.java (original) +++ incubator/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/services/FilterManagerServiceImpl.java Tue May 5 06:21:18 2009 @@ -26,6 +26,7 @@ import org.apache.pluto.container.FilterManager; import org.apache.pluto.container.FilterManagerService; +import org.apache.pluto.container.PortletWindow; import org.apache.pluto.container.om.portlet.Filter; import org.apache.pluto.container.om.portlet.FilterMapping; import org.apache.pluto.container.om.portlet.PortletApplicationDefinition; @@ -65,11 +66,12 @@ } /** - * @see org.apache.pluto.container.FilterManagerService#getFilterManager(org.apache.pluto.container.om.portlet.PortletApplicationDefinition, java.lang.String, java.lang.String) + * @see org.apache.pluto.container.FilterManagerService#getFilterManager(org.apache.pluto.container.PortletWindow, java.lang.String) */ - public FilterManager getFilterManager(final PortletApplicationDefinition portletApp, - final String portletName, + public FilterManager getFilterManager(final PortletWindow portletWindow, final String lifeCycle) { + final PortletApplicationDefinition portletApp = portletWindow.getPortletEntity().getPortletDefinition().getApplication(); + final String portletName = portletWindow.getPortletEntity().getPortletDefinition().getPortletName(); final List filterMappingList = portletApp.getFilterMappings(); if (filterMappingList != null && filterMappingList.size() > 0 ) { final Map appFilters = filters.get(portletApp.getName());