Return-Path: Delivered-To: apmail-portals-pluto-scm-archive@www.apache.org Received: (qmail 56706 invoked from network); 10 Mar 2009 10:46:50 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 10 Mar 2009 10:46:50 -0000 Received: (qmail 53456 invoked by uid 500); 10 Mar 2009 10:46:50 -0000 Delivered-To: apmail-portals-pluto-scm-archive@portals.apache.org Received: (qmail 53420 invoked by uid 500); 10 Mar 2009 10:46:49 -0000 Mailing-List: contact pluto-scm-help@portals.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list pluto-scm@portals.apache.org Received: (qmail 53411 invoked by uid 99); 10 Mar 2009 10:46:49 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Mar 2009 03:46:49 -0700 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, 10 Mar 2009 10:46:47 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 004F123889D4; Tue, 10 Mar 2009 10:46:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r752052 [2/2] - in /portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto: container/ container/driver/ container/internal/ container/services/ container/spi/ container/spi/optional/ om/ spi/ Date: Tue, 10 Mar 2009 10:46:24 -0000 To: pluto-scm@portals.apache.org From: ate@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090310104626.004F123889D4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletRegistryListener.java (from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRegistryListener.java) URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletRegistryListener.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletRegistryListener.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRegistryListener.java&r1=752027&r2=752052&rev=752052&view=diff ============================================================================== --- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRegistryListener.java (original) +++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletRegistryListener.java Tue Mar 10 10:46:22 2009 @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.pluto.container.spi.optional; +package org.apache.pluto.container.driver; /** * Listener interface implemented by observers of Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletRegistryListener.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletRegistryListener.java ------------------------------------------------------------------------------ svn:keywords = Id Author Date Rev Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletRegistryService.java (from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRegistryService.java) URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletRegistryService.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletRegistryService.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRegistryService.java&r1=752027&r2=752052&rev=752052&view=diff ============================================================================== --- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRegistryService.java (original) +++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletRegistryService.java Tue Mar 10 10:46:22 2009 @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.pluto.container.spi.optional; +package org.apache.pluto.container.driver; import java.util.Iterator; Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletRegistryService.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletRegistryService.java ------------------------------------------------------------------------------ svn:keywords = Id Author Date Rev Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletServlet.java URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletServlet.java?rev=752052&r1=752051&r2=752052&view=diff ============================================================================== --- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletServlet.java (original) +++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletServlet.java Tue Mar 10 10:46:22 2009 @@ -45,19 +45,14 @@ import org.apache.pluto.container.Constants; import org.apache.pluto.container.ContainerInvocation; -import org.apache.pluto.container.InternalPortletConfig; -import org.apache.pluto.container.InternalPortletContext; +import org.apache.pluto.container.ContainerInvocationService; +import org.apache.pluto.container.ContainerPortletConfig; +import org.apache.pluto.container.ContainerPortletContext; +import org.apache.pluto.container.FilterManager; import org.apache.pluto.container.PortletContainerException; +import org.apache.pluto.container.PortletRequestContext; import org.apache.pluto.container.PortletWindow; import org.apache.pluto.container.om.portlet.PortletDefinition; -import org.apache.pluto.container.spi.ContainerInvocationService; -import org.apache.pluto.container.spi.FilterManager; -import org.apache.pluto.container.spi.optional.AdministrativeRequestListener; -import org.apache.pluto.container.spi.optional.PortalAdministrationService; -import org.apache.pluto.container.spi.optional.PortletContextService; -import org.apache.pluto.container.spi.optional.PortletInvocationEvent; -import org.apache.pluto.container.spi.optional.PortletInvocationListener; -import org.apache.pluto.container.spi.optional.PortletRequestContext; /** * Portlet Invocation Servlet. This servlet recieves cross context requests from @@ -115,12 +110,12 @@ /** * The internal portlet context instance. */ - private InternalPortletContext portletContext; + private ContainerPortletContext portletContext; /** * The internal portlet config instance. */ - private InternalPortletConfig portletConfig; + private ContainerPortletConfig portletConfig; /** * The Event Portlet instance (the same object as portlet) wrapped by this