Return-Path: X-Original-To: apmail-sling-commits-archive@www.apache.org Delivered-To: apmail-sling-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9E7DEC320 for ; Wed, 18 Jul 2012 09:01:00 +0000 (UTC) Received: (qmail 35320 invoked by uid 500); 18 Jul 2012 09:01:00 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 35225 invoked by uid 500); 18 Jul 2012 09:00:59 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 35199 invoked by uid 99); 18 Jul 2012 09:00:58 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Jul 2012 09:00:58 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Wed, 18 Jul 2012 09:00:55 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id BD26C23889EC; Wed, 18 Jul 2012 09:00:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1362819 - in /sling/whiteboard/portal/container: ./ src/main/java/org/apache/sling/portal/container/internal/ src/main/java/org/apache/sling/portal/container/spi/ Date: Wed, 18 Jul 2012 09:00:34 -0000 To: commits@sling.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120718090034.BD26C23889EC@eris.apache.org> Author: cziegeler Date: Wed Jul 18 09:00:34 2012 New Revision: 1362819 URL: http://svn.apache.org/viewvc?rev=1362819&view=rev Log: Correct method name, put default impl into separate class Added: sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/DefaultPortalEventCoordinatorService.java (with props) Modified: sling/whiteboard/portal/container/pom.xml sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/ContainerServicesImpl.java sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/EventCoordinationServiceImpl.java sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/spi/PortalEventCoordinatorService.java Modified: sling/whiteboard/portal/container/pom.xml URL: http://svn.apache.org/viewvc/sling/whiteboard/portal/container/pom.xml?rev=1362819&r1=1362818&r2=1362819&view=diff ============================================================================== --- sling/whiteboard/portal/container/pom.xml (original) +++ sling/whiteboard/portal/container/pom.xml Wed Jul 18 09:00:34 2012 @@ -28,7 +28,7 @@ org.apache.sling.portal org.apache.sling.portal.container - 0.5.0-SNAPSHOT + 0.6.0-SNAPSHOT bundle Apache Sling Portal Container Modified: sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/ContainerServicesImpl.java URL: http://svn.apache.org/viewvc/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/ContainerServicesImpl.java?rev=1362819&r1=1362818&r2=1362819&view=diff ============================================================================== --- sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/ContainerServicesImpl.java (original) +++ sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/ContainerServicesImpl.java Wed Jul 18 09:00:34 2012 @@ -16,10 +16,6 @@ */ package org.apache.sling.portal.container.internal; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - import javax.portlet.PortalContext; import org.apache.pluto.container.CCPPProfileService; @@ -37,12 +33,9 @@ import org.apache.pluto.container.Reques import org.apache.pluto.container.UserInfoService; import org.apache.pluto.container.impl.PortletEnvironmentServiceImpl; import org.apache.pluto.container.impl.RequestDispatcherServiceImpl; -import org.apache.sling.api.SlingHttpServletRequest; import org.apache.sling.jcr.api.SlingRepository; import org.apache.sling.portal.container.PortletRegistryService; import org.apache.sling.portal.container.PortletWindowManager; -import org.apache.sling.portal.container.SlingPortletEntity; -import org.apache.sling.portal.container.SlingPortletWindow; import org.apache.sling.portal.container.internal.services.DefaultNamespaceMapper; import org.apache.sling.portal.container.internal.services.DefaultPortletInvokerService; import org.apache.sling.portal.container.internal.services.DefaultPortletPreferencesService; @@ -116,19 +109,7 @@ public class ContainerServicesImpl imple this.userInfoServiceTracker = new ServiceTracker(bundleContext, PortalUserInfoService.class.getName(), null); this.userInfoServiceTracker.open(); - this.defaultEventCoordinator = new PortalEventCoordinatorService() { - - public List getPortletWindow(final SlingHttpServletRequest request) { - final List windows = new ArrayList(); - final Iterator i = registry.getPortletEntities(); - while ( i.hasNext() ) { - final SlingPortletEntity entity = i.next(); - windows.add(windowManager.getPortletWindow(entity.getPortletEntityId(), null, null)); - } - - return windows; - } - }; + this.defaultEventCoordinator = new DefaultPortalEventCoordinatorService(registry, windowManager); this.eventCoordinatorServiceTracker = new ServiceTracker(bundleContext, PortalEventCoordinatorService.class.getName(), null); this.eventCoordinatorServiceTracker.open(); noErrors = true; Added: sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/DefaultPortalEventCoordinatorService.java URL: http://svn.apache.org/viewvc/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/DefaultPortalEventCoordinatorService.java?rev=1362819&view=auto ============================================================================== --- sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/DefaultPortalEventCoordinatorService.java (added) +++ sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/DefaultPortalEventCoordinatorService.java Wed Jul 18 09:00:34 2012 @@ -0,0 +1,58 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.sling.portal.container.internal; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import org.apache.sling.api.SlingHttpServletRequest; +import org.apache.sling.portal.container.PortletRegistryService; +import org.apache.sling.portal.container.PortletWindowManager; +import org.apache.sling.portal.container.SlingPortletEntity; +import org.apache.sling.portal.container.SlingPortletWindow; +import org.apache.sling.portal.container.spi.PortalEventCoordinatorService; + +/** + * Default implementation just returning all portlet entities. + */ +public class DefaultPortalEventCoordinatorService implements PortalEventCoordinatorService { + + private final PortletRegistryService registry; + + private final PortletWindowManager windowManager; + + public DefaultPortalEventCoordinatorService(final PortletRegistryService registry, + final PortletWindowManager windowManager) { + this.registry = registry; + this.windowManager = windowManager; + } + + /** + * @see org.apache.sling.portal.container.spi.PortalEventCoordinatorService#getPortletWindows(org.apache.sling.api.SlingHttpServletRequest) + */ + public List getPortletWindows(final SlingHttpServletRequest request) { + final List windows = new ArrayList(); + final Iterator i = registry.getPortletEntities(); + while ( i.hasNext() ) { + final SlingPortletEntity entity = i.next(); + windows.add(windowManager.getPortletWindow(entity.getPortletEntityId(), null, null)); + } + + return windows; + } +} Propchange: sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/DefaultPortalEventCoordinatorService.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/DefaultPortalEventCoordinatorService.java ------------------------------------------------------------------------------ svn:keywords = author date id revision rev url Propchange: sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/DefaultPortalEventCoordinatorService.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/EventCoordinationServiceImpl.java URL: http://svn.apache.org/viewvc/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/EventCoordinationServiceImpl.java?rev=1362819&r1=1362818&r2=1362819&view=diff ============================================================================== --- sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/EventCoordinationServiceImpl.java (original) +++ sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/internal/EventCoordinationServiceImpl.java Wed Jul 18 09:00:34 2012 @@ -76,7 +76,7 @@ public class EventCoordinationServiceImp windows = (List)windowsObj; } else { final PortalEventCoordinatorService pecs = portletContainer.getPortalEventCoordinatorService(); - windows = pecs.getPortletWindow(PortalUtil.getSlingHttpServletRequest(request)); + windows = pecs.getPortletWindows(PortalUtil.getSlingHttpServletRequest(request)); request.setAttribute(ATTR_WINDOWS, windows); } Modified: sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/spi/PortalEventCoordinatorService.java URL: http://svn.apache.org/viewvc/sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/spi/PortalEventCoordinatorService.java?rev=1362819&r1=1362818&r2=1362819&view=diff ============================================================================== --- sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/spi/PortalEventCoordinatorService.java (original) +++ sling/whiteboard/portal/container/src/main/java/org/apache/sling/portal/container/spi/PortalEventCoordinatorService.java Wed Jul 18 09:00:34 2012 @@ -22,7 +22,7 @@ import org.apache.sling.api.SlingHttpSer import org.apache.sling.portal.container.SlingPortletWindow; /** - * Required service for event delivery + * Optional service for event delivery. */ public interface PortalEventCoordinatorService { @@ -30,5 +30,5 @@ public interface PortalEventCoordinatorS * Return all portlet window's that might get events for the current request. * @return List of portlet window ids - list might be empty - but not null */ - List getPortletWindow(final SlingHttpServletRequest request); + List getPortletWindows(final SlingHttpServletRequest request); }