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/

[at...@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