portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r752052 [1/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 GMT
Author: ate
Date: Tue Mar 10 10:46:22 2009
New Revision: 752052

URL: http://svn.apache.org/viewvc?rev=752052&view=rev
Log:
PLUTO-537: Cleaning up Pluto packages
See: https://issues.apache.org/jira/browse/PLUTO-537
- further cleanup and moving container interfaces to their targeted packages

Added:
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/CCPPProfileService.java   (contents, props changed)
      - copied, changed from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/CCPPProfileService.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ContainerInvocationService.java   (contents, props changed)
      - copied, changed from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/ContainerInvocationService.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ContainerPortletConfig.java   (contents, props changed)
      - copied, changed from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/InternalPortletConfig.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ContainerPortletContext.java   (contents, props changed)
      - copied, changed from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/InternalPortletContext.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ContainerServices.java   (contents, props changed)
      - copied, changed from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/services/ContainerServices.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/EventCoordinationService.java   (contents, props changed)
      - copied, changed from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/EventCoordinationService.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/EventProvider.java   (contents, props changed)
      - copied, changed from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/EventProvider.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/FilterManager.java   (contents, props changed)
      - copied, changed from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/FilterManager.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/P3PAttributes.java   (contents, props changed)
      - copied, changed from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/P3PAttributes.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortalCallbackService.java   (contents, props changed)
      - copied, changed from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/PortalCallbackService.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletActionResponseContext.java   (contents, props changed)
      - copied, changed from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletActionResponseContext.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletAppDescriptorService.java   (contents, props changed)
      - copied, changed from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/services/PortletAppDescriptorService.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletEnvironmentService.java   (contents, props changed)
      - copied, changed from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletEnvironmentService.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletEventResponseContext.java   (contents, props changed)
      - copied, changed from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletEventResponseContext.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletInfoService.java   (contents, props changed)
      - copied, changed from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletInfoService.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletInvokerService.java   (contents, props changed)
      - copied, changed from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletInvokerService.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletMimeResponseContext.java   (contents, props changed)
      - copied, changed from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletMimeResponseContext.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletPreference.java   (contents, props changed)
      - copied, changed from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/InternalPortletPreference.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletPreferencesService.java   (contents, props changed)
      - copied, changed from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletPreferencesService.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletRenderResponseContext.java   (contents, props changed)
      - copied, changed from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRenderResponseContext.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletRequestContext.java   (contents, props changed)
      - copied, changed from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRequestContext.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletRequestContextService.java   (contents, props changed)
      - copied, changed from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRequestContextService.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletResourceRequestContext.java   (contents, props changed)
      - copied, changed from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletResourceRequestContext.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletResourceResponseContext.java   (contents, props changed)
      - copied, changed from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletResourceResponseContext.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletResponseContext.java   (contents, props changed)
      - copied, changed from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletResponseContext.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletStateAwareResponseContext.java   (contents, props changed)
      - copied, changed from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletStateAwareResponseContext.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletURLListener.java   (contents, props changed)
      - copied, changed from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/PortletURLListener.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletURLProvider.java   (contents, props changed)
      - copied, changed from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/PortletURLProvider.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ResourceURLProvider.java   (contents, props changed)
      - copied, changed from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/ResourceURLProvider.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/UserInfoService.java   (contents, props changed)
      - copied, changed from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/UserInfoService.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/AdministrativeRequestListener.java   (contents, props changed)
      - copied, changed from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/AdministrativeRequestListener.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PlutoConfigurationException.java   (contents, props changed)
      - copied, changed from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PlutoConfigurationException.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortalAdministrationService.java   (contents, props changed)
      - copied, changed from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortalAdministrationService.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletContextService.java   (contents, props changed)
      - copied, changed from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletContextService.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletInvocationEvent.java   (contents, props changed)
      - copied, changed from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletInvocationEvent.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletInvocationListener.java   (contents, props changed)
      - copied, changed from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletInvocationListener.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletRegistryEvent.java   (contents, props changed)
      - copied, changed from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRegistryEvent.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletRegistryListener.java   (contents, props changed)
      - copied, changed from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRegistryListener.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletRegistryService.java   (contents, props changed)
      - copied, changed from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRegistryService.java
Removed:
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/InternalPortletConfig.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/InternalPortletContext.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/InternalPortletPreference.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PlutoConfigurationException.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletContainerRuntimeException.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/internal/
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/services/
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/CCPPProfileService.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/ContainerInvocationService.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/EventCoordinationService.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/EventProvider.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/FilterManager.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/PortalCallbackService.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/PortletURLListener.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/PortletURLProvider.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/ResourceURLProvider.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/om/
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/
Modified:
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/Constants.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/OptionalContainerServices.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/RequiredContainerServices.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PlutoServices.java
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletServlet.java

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/CCPPProfileService.java (from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/CCPPProfileService.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/CCPPProfileService.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/CCPPProfileService.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/CCPPProfileService.java&r1=752027&r2=752052&rev=752052&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/CCPPProfileService.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/CCPPProfileService.java Tue Mar 10 10:46:22 2009
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.apache.pluto.container.spi;
+package org.apache.pluto.container;
 
 import javax.ccpp.Profile;
 import javax.servlet.http.HttpServletRequest;

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/CCPPProfileService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/Constants.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/Constants.java?rev=752052&r1=752051&r2=752052&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/Constants.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/Constants.java Tue Mar 10 10:46:22 2009
@@ -16,7 +16,6 @@
  */
 package org.apache.pluto.container;
 
-import org.apache.pluto.container.spi.optional.PortletRequestContext;
 
 /**
  * Constant values used to bind internal portlet objects as attributes,

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ContainerInvocationService.java (from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/ContainerInvocationService.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ContainerInvocationService.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ContainerInvocationService.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/ContainerInvocationService.java&r1=752027&r2=752052&rev=752052&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/ContainerInvocationService.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ContainerInvocationService.java Tue Mar 10 10:46:22 2009
@@ -14,11 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.spi;
+package org.apache.pluto.container;
 
-import org.apache.pluto.container.ContainerInvocation;
-import org.apache.pluto.container.PortletContainer;
-import org.apache.pluto.container.PortletWindow;
 
 
 public interface ContainerInvocationService

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ContainerInvocationService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ContainerPortletConfig.java (from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/InternalPortletConfig.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ContainerPortletConfig.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ContainerPortletConfig.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/InternalPortletConfig.java&r1=752027&r2=752052&rev=752052&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/InternalPortletConfig.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ContainerPortletConfig.java Tue Mar 10 10:46:22 2009
@@ -20,10 +20,10 @@
 
 import org.apache.pluto.container.om.portlet.PortletDefinition;
 
-public interface InternalPortletConfig extends PortletConfig {
+public interface ContainerPortletConfig extends PortletConfig {
 
     PortletDefinition getPortletDefinition();
-    InternalPortletContext getPortletContext();
+    ContainerPortletContext getPortletContext();
 }
 
 

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ContainerPortletConfig.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ContainerPortletContext.java (from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/InternalPortletContext.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ContainerPortletContext.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ContainerPortletContext.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/InternalPortletContext.java&r1=752027&r2=752052&rev=752052&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/InternalPortletContext.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ContainerPortletContext.java Tue Mar 10 10:46:22 2009
@@ -21,7 +21,7 @@
 
 import org.apache.pluto.container.om.portlet.PortletApplicationDefinition;
 
-public interface InternalPortletContext extends PortletContext {
+public interface ContainerPortletContext extends PortletContext {
 
     /**
      * Retrieve the unique identifier for the portlet context.

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ContainerPortletContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ContainerServices.java (from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/services/ContainerServices.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ContainerServices.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ContainerServices.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/services/ContainerServices.java&r1=752027&r2=752052&rev=752052&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/services/ContainerServices.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ContainerServices.java Tue Mar 10 10:46:22 2009
@@ -14,10 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.services;
+package org.apache.pluto.container;
 
-import org.apache.pluto.container.OptionalContainerServices;
-import org.apache.pluto.container.RequiredContainerServices;
 
 
 public interface ContainerServices extends RequiredContainerServices, OptionalContainerServices

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ContainerServices.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/EventCoordinationService.java (from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/EventCoordinationService.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/EventCoordinationService.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/EventCoordinationService.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/EventCoordinationService.java&r1=752027&r2=752052&rev=752052&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/EventCoordinationService.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/EventCoordinationService.java Tue Mar 10 10:46:22 2009
@@ -15,13 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.pluto.container.spi;
+package org.apache.pluto.container;
 
 import java.util.List;
 
 import javax.portlet.Event;
 
-import org.apache.pluto.container.PortletWindow;
 
 /**
  * @author <a href="mailto:ate@douma.nu">Ate Douma</a>

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/EventCoordinationService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/EventCoordinationService.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/EventCoordinationService.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/EventProvider.java (from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/EventProvider.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/EventProvider.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/EventProvider.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/EventProvider.java&r1=752027&r2=752052&rev=752052&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/EventProvider.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/EventProvider.java Tue Mar 10 10:46:22 2009
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.spi;
+package org.apache.pluto.container;
 
 import java.io.Serializable;
 

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/EventProvider.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/FilterManager.java (from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/FilterManager.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/FilterManager.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/FilterManager.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/FilterManager.java&r1=752027&r2=752052&rev=752052&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/FilterManager.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/FilterManager.java Tue Mar 10 10:46:22 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.spi;
+package org.apache.pluto.container;
 
 import java.io.IOException;
 

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/FilterManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/OptionalContainerServices.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/OptionalContainerServices.java?rev=752052&r1=752051&r2=752052&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/OptionalContainerServices.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/OptionalContainerServices.java Tue Mar 10 10:46:22 2009
@@ -16,15 +16,9 @@
  */
 package org.apache.pluto.container;
 
-import org.apache.pluto.container.spi.optional.PortalAdministrationService;
-import org.apache.pluto.container.spi.optional.PortletContextService;
-import org.apache.pluto.container.spi.optional.PortletEnvironmentService;
-import org.apache.pluto.container.spi.optional.PortletInfoService;
-import org.apache.pluto.container.spi.optional.PortletInvokerService;
-import org.apache.pluto.container.spi.optional.PortletPreferencesService;
-import org.apache.pluto.container.spi.optional.PortletRegistryService;
-import org.apache.pluto.container.spi.optional.PortletRequestContextService;
-import org.apache.pluto.container.spi.optional.UserInfoService;
+import org.apache.pluto.container.driver.PortalAdministrationService;
+import org.apache.pluto.container.driver.PortletContextService;
+import org.apache.pluto.container.driver.PortletRegistryService;
 
 /**
  * Defines the services necessary for integration between the Pluto Container

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/P3PAttributes.java (from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/P3PAttributes.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/P3PAttributes.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/P3PAttributes.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/P3PAttributes.java&r1=752027&r2=752052&rev=752052&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/P3PAttributes.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/P3PAttributes.java Tue Mar 10 10:46:22 2009
@@ -14,7 +14,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;
 
 /**
  * As defined in PLT.D of the JSR-168 specification, this class defines a set of

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/P3PAttributes.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortalCallbackService.java (from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/PortalCallbackService.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortalCallbackService.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortalCallbackService.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/PortalCallbackService.java&r1=752027&r2=752052&rev=752052&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/PortalCallbackService.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortalCallbackService.java Tue Mar 10 10:46:22 2009
@@ -14,11 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.spi;
+package org.apache.pluto.container;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.pluto.container.PortletWindow;
 import org.apache.pluto.container.om.portlet.PortletApplicationDefinition;
 
 /**

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortalCallbackService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletActionResponseContext.java (from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletActionResponseContext.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletActionResponseContext.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletActionResponseContext.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletActionResponseContext.java&r1=752027&r2=752052&rev=752052&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletActionResponseContext.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletActionResponseContext.java Tue Mar 10 10:46:22 2009
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.pluto.container.spi.optional;
+package org.apache.pluto.container;
 
 /**
  * @author <a href="mailto:ate@douma.nu">Ate Douma</a>

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletActionResponseContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletActionResponseContext.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletActionResponseContext.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletAppDescriptorService.java (from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/services/PortletAppDescriptorService.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletAppDescriptorService.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletAppDescriptorService.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/services/PortletAppDescriptorService.java&r1=752027&r2=752052&rev=752052&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/services/PortletAppDescriptorService.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletAppDescriptorService.java Tue Mar 10 10:46:22 2009
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.pluto.container.services;
+package org.apache.pluto.container;
 
 import java.io.IOException;
 import java.io.InputStream;

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletAppDescriptorService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletAppDescriptorService.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletEnvironmentService.java (from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletEnvironmentService.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletEnvironmentService.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletEnvironmentService.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletEnvironmentService.java&r1=752027&r2=752052&rev=752052&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletEnvironmentService.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletEnvironmentService.java Tue Mar 10 10:46:22 2009
@@ -14,7 +14,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;
 
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
@@ -30,7 +30,6 @@
 import javax.portlet.ResourceResponse;
 import javax.servlet.http.HttpSession;
 
-import org.apache.pluto.container.PortletWindow;
 
 /**
  * Factory Service for creating Portlet request, responses and session.

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletEnvironmentService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletEventResponseContext.java (from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletEventResponseContext.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletEventResponseContext.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletEventResponseContext.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletEventResponseContext.java&r1=752027&r2=752052&rev=752052&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletEventResponseContext.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletEventResponseContext.java Tue Mar 10 10:46:22 2009
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.pluto.container.spi.optional;
+package org.apache.pluto.container;
 
 /**
  * @author <a href="mailto:ate@douma.nu">Ate Douma</a>

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletEventResponseContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletEventResponseContext.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletEventResponseContext.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletInfoService.java (from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletInfoService.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletInfoService.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletInfoService.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletInfoService.java&r1=752027&r2=752052&rev=752052&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletInfoService.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletInfoService.java Tue Mar 10 10:46:22 2009
@@ -15,9 +15,8 @@
  * 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;
 
-import org.apache.pluto.container.PortletWindow;
 
 /**
  * Callback service which makes it possible to customize

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletInfoService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletInfoService.java
------------------------------------------------------------------------------
    svn:keywords = Id Author Date Rev

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletInvokerService.java (from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletInvokerService.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletInvokerService.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletInvokerService.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletInvokerService.java&r1=752027&r2=752052&rev=752052&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletInvokerService.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletInvokerService.java Tue Mar 10 10:46:22 2009
@@ -14,7 +14,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;
 
 import java.io.IOException;
 
@@ -30,8 +30,6 @@
 import javax.portlet.ResourceRequest;
 import javax.portlet.ResourceResponse;
 
-import org.apache.pluto.container.PortletContainerException;
-import org.apache.pluto.container.spi.FilterManager;
 
 /**
  * Service used to invoke portlets.

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletInvokerService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletMimeResponseContext.java (from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletMimeResponseContext.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletMimeResponseContext.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletMimeResponseContext.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletMimeResponseContext.java&r1=752027&r2=752052&rev=752052&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletMimeResponseContext.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletMimeResponseContext.java Tue Mar 10 10:46:22 2009
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.pluto.container.spi.optional;
+package org.apache.pluto.container;
 
 import java.io.OutputStream;
 import java.io.PrintWriter;

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletMimeResponseContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletMimeResponseContext.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletMimeResponseContext.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletPreference.java (from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/InternalPortletPreference.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletPreference.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletPreference.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/InternalPortletPreference.java&r1=752027&r2=752052&rev=752052&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/InternalPortletPreference.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletPreference.java Tue Mar 10 10:46:22 2009
@@ -20,7 +20,7 @@
  * This class represents a portlet preference, which is a name-value pair.
  *
  */
-public interface InternalPortletPreference {
+public interface PortletPreference {
 
 	/**
 	 * Returns the name of this portlet preference.
@@ -50,6 +50,6 @@
      * Clone a copy of itself.
      * @return a copy of itself.
      */
-    public InternalPortletPreference clone();
+    public PortletPreference clone();
 
 }

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletPreference.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletPreferencesService.java (from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletPreferencesService.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletPreferencesService.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletPreferencesService.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletPreferencesService.java&r1=752027&r2=752052&rev=752052&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletPreferencesService.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletPreferencesService.java Tue Mar 10 10:46:22 2009
@@ -14,7 +14,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;
 
 import java.util.Map;
 
@@ -22,9 +22,6 @@
 import javax.portlet.PreferencesValidator;
 import javax.portlet.ValidatorException;
 
-import org.apache.pluto.container.InternalPortletPreference;
-import org.apache.pluto.container.PortletContainerException;
-import org.apache.pluto.container.PortletWindow;
 import org.apache.pluto.container.om.portlet.PortletDefinition;
 
 /**
@@ -41,7 +38,7 @@
      * @return the default portlet preferences.
      * @throws PortletContainerException  if fail to get default preferences.
      */
-    public Map<String, InternalPortletPreference> getDefaultPreferences(
+    public Map<String, PortletPreference> getDefaultPreferences(
             PortletWindow portletWindow,
             PortletRequest request)
     throws PortletContainerException;
@@ -53,7 +50,7 @@
 	 * @return the stored portlet preferences.
 	 * @throws PortletContainerException  if fail to get stored preferences.
 	 */
-    public Map<String, InternalPortletPreference> getStoredPreferences(
+    public Map<String, PortletPreference> getStoredPreferences(
     		PortletWindow portletWindow,
     		PortletRequest request)
     throws PortletContainerException;
@@ -67,7 +64,7 @@
      */
     public void store(PortletWindow portletWindow,
                       PortletRequest request,
-                      Map<String, InternalPortletPreference> preferences)
+                      Map<String, PortletPreference> preferences)
     throws PortletContainerException;
 
     /**

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletPreferencesService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletRenderResponseContext.java (from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRenderResponseContext.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletRenderResponseContext.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletRenderResponseContext.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRenderResponseContext.java&r1=752027&r2=752052&rev=752052&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRenderResponseContext.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletRenderResponseContext.java Tue Mar 10 10:46:22 2009
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.pluto.container.spi.optional;
+package org.apache.pluto.container;
 
 import java.util.Collection;
 

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletRenderResponseContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletRenderResponseContext.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletRenderResponseContext.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletRequestContext.java (from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRequestContext.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletRequestContext.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletRequestContext.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRequestContext.java&r1=752027&r2=752052&rev=752052&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRequestContext.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletRequestContext.java Tue Mar 10 10:46:22 2009
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.pluto.container.spi.optional;
+package org.apache.pluto.container;
 
 import java.util.Enumeration;
 import java.util.Locale;
@@ -25,9 +25,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.pluto.container.InternalPortletConfig;
-import org.apache.pluto.container.PortletContainer;
-import org.apache.pluto.container.PortletWindow;
 
 /**
  * @author <a href="mailto:ate@douma.nu">Ate Douma</a>
@@ -35,9 +32,9 @@
  */
 public interface PortletRequestContext
 {
-    void init(InternalPortletConfig portletConfig);
+    void init(ContainerPortletConfig portletConfig);
     PortletContainer getContainer();
-    InternalPortletConfig getPortletConfig();
+    ContainerPortletConfig getPortletConfig();
     HttpServletRequest getServletRequest();
     HttpServletResponse getServletResponse();
     PortletWindow getPortletWindow();

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletRequestContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletRequestContext.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletRequestContext.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletRequestContextService.java (from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRequestContextService.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletRequestContextService.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletRequestContextService.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRequestContextService.java&r1=752027&r2=752052&rev=752052&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRequestContextService.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletRequestContextService.java Tue Mar 10 10:46:22 2009
@@ -14,13 +14,11 @@
  * 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;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.pluto.container.PortletContainer;
-import org.apache.pluto.container.PortletWindow;
 
 /**
  * @author <a href="mailto:ate@douma.nu">Ate Douma</a>

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletRequestContextService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletRequestContextService.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletRequestContextService.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletResourceRequestContext.java (from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletResourceRequestContext.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletResourceRequestContext.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletResourceRequestContext.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletResourceRequestContext.java&r1=752027&r2=752052&rev=752052&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletResourceRequestContext.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletResourceRequestContext.java Tue Mar 10 10:46:22 2009
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.pluto.container.spi.optional;
+package org.apache.pluto.container;
 
 import java.util.Map;
 

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletResourceRequestContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletResourceRequestContext.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletResourceRequestContext.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletResourceResponseContext.java (from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletResourceResponseContext.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletResourceResponseContext.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletResourceResponseContext.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletResourceResponseContext.java&r1=752027&r2=752052&rev=752052&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletResourceResponseContext.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletResourceResponseContext.java Tue Mar 10 10:46:22 2009
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.pluto.container.spi.optional;
+package org.apache.pluto.container;
 
 import java.util.Locale;
 

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletResourceResponseContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletResourceResponseContext.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletResourceResponseContext.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletResponseContext.java (from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletResponseContext.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletResponseContext.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletResponseContext.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletResponseContext.java&r1=752027&r2=752052&rev=752052&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletResponseContext.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletResponseContext.java Tue Mar 10 10:46:22 2009
@@ -15,14 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.pluto.container.spi.optional;
+package org.apache.pluto.container;
 
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.pluto.container.PortletContainer;
-import org.apache.pluto.container.PortletWindow;
 import org.w3c.dom.Element;
 
 /**

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletResponseContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletResponseContext.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletResponseContext.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletStateAwareResponseContext.java (from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletStateAwareResponseContext.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletStateAwareResponseContext.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletStateAwareResponseContext.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletStateAwareResponseContext.java&r1=752027&r2=752052&rev=752052&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletStateAwareResponseContext.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletStateAwareResponseContext.java Tue Mar 10 10:46:22 2009
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.pluto.container.spi.optional;
+package org.apache.pluto.container;
 
 import java.util.List;
 import java.util.Map;

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletStateAwareResponseContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletStateAwareResponseContext.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletStateAwareResponseContext.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletURLListener.java (from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/PortletURLListener.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletURLListener.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletURLListener.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/PortletURLListener.java&r1=752027&r2=752052&rev=752052&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/PortletURLListener.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletURLListener.java Tue Mar 10 10:46:22 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.spi;
+package org.apache.pluto.container;
 
 import javax.portlet.BaseURL;
 

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletURLListener.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletURLProvider.java (from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/PortletURLProvider.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletURLProvider.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletURLProvider.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/PortletURLProvider.java&r1=752027&r2=752052&rev=752052&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/PortletURLProvider.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletURLProvider.java Tue Mar 10 10:46:22 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.spi;
+package org.apache.pluto.container;
 
 import java.io.Writer;
 import java.util.List;

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletURLProvider.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/RequiredContainerServices.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/RequiredContainerServices.java?rev=752052&r1=752051&r2=752052&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/RequiredContainerServices.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/RequiredContainerServices.java Tue Mar 10 10:46:22 2009
@@ -18,10 +18,6 @@
 
 import javax.portlet.PortalContext;
 
-import org.apache.pluto.container.spi.CCPPProfileService;
-import org.apache.pluto.container.spi.ContainerInvocationService;
-import org.apache.pluto.container.spi.EventCoordinationService;
-import org.apache.pluto.container.spi.PortalCallbackService;
 
 /**
  * This interface defines the services required for integration between the

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ResourceURLProvider.java (from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/ResourceURLProvider.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ResourceURLProvider.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ResourceURLProvider.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/ResourceURLProvider.java&r1=752027&r2=752052&rev=752052&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/ResourceURLProvider.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ResourceURLProvider.java Tue Mar 10 10:46:22 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.spi;
+package org.apache.pluto.container;
 
 /**
  *

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/ResourceURLProvider.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/UserInfoService.java (from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/UserInfoService.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/UserInfoService.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/UserInfoService.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/UserInfoService.java&r1=752027&r2=752052&rev=752052&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/UserInfoService.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/UserInfoService.java Tue Mar 10 10:46:22 2009
@@ -15,14 +15,12 @@
  * 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;
 
 import java.util.Map;
 
 import javax.portlet.PortletRequest;
 
-import org.apache.pluto.container.PortletContainerException;
-import org.apache.pluto.container.PortletWindow;
 
 /**
  * Used to access user information attributes as described in

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/UserInfoService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/UserInfoService.java
------------------------------------------------------------------------------
    svn:keywords = Id Author Date Rev

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/AdministrativeRequestListener.java (from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/AdministrativeRequestListener.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/AdministrativeRequestListener.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/AdministrativeRequestListener.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/AdministrativeRequestListener.java&r1=752027&r2=752052&rev=752052&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/AdministrativeRequestListener.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/AdministrativeRequestListener.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 javax.portlet.PortletRequest;
 import javax.portlet.PortletResponse;

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/AdministrativeRequestListener.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/AdministrativeRequestListener.java
------------------------------------------------------------------------------
    svn:keywords = Id Author Date Rev

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PlutoConfigurationException.java (from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PlutoConfigurationException.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PlutoConfigurationException.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PlutoConfigurationException.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PlutoConfigurationException.java&r1=752027&r2=752052&rev=752052&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PlutoConfigurationException.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PlutoConfigurationException.java Tue Mar 10 10:46:22 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container;
+package org.apache.pluto.container.driver;
 
 /**
  * Exception thrown when Pluto configuration fails.

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PlutoConfigurationException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PlutoServices.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PlutoServices.java?rev=752052&r1=752051&r2=752052&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PlutoServices.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PlutoServices.java Tue Mar 10 10:46:22 2009
@@ -18,21 +18,18 @@
 
 import javax.portlet.PortalContext;
 
+import org.apache.pluto.container.CCPPProfileService;
+import org.apache.pluto.container.ContainerInvocationService;
+import org.apache.pluto.container.ContainerServices;
+import org.apache.pluto.container.EventCoordinationService;
 import org.apache.pluto.container.NamespaceMapper;
-import org.apache.pluto.container.services.ContainerServices;
-import org.apache.pluto.container.spi.CCPPProfileService;
-import org.apache.pluto.container.spi.ContainerInvocationService;
-import org.apache.pluto.container.spi.EventCoordinationService;
-import org.apache.pluto.container.spi.PortalCallbackService;
-import org.apache.pluto.container.spi.optional.PortalAdministrationService;
-import org.apache.pluto.container.spi.optional.PortletContextService;
-import org.apache.pluto.container.spi.optional.PortletEnvironmentService;
-import org.apache.pluto.container.spi.optional.PortletInfoService;
-import org.apache.pluto.container.spi.optional.PortletInvokerService;
-import org.apache.pluto.container.spi.optional.PortletPreferencesService;
-import org.apache.pluto.container.spi.optional.PortletRegistryService;
-import org.apache.pluto.container.spi.optional.PortletRequestContextService;
-import org.apache.pluto.container.spi.optional.UserInfoService;
+import org.apache.pluto.container.PortalCallbackService;
+import org.apache.pluto.container.PortletEnvironmentService;
+import org.apache.pluto.container.PortletInfoService;
+import org.apache.pluto.container.PortletInvokerService;
+import org.apache.pluto.container.PortletPreferencesService;
+import org.apache.pluto.container.PortletRequestContextService;
+import org.apache.pluto.container.UserInfoService;
 
 
 public class PlutoServices implements ContainerServices

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortalAdministrationService.java (from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortalAdministrationService.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortalAdministrationService.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortalAdministrationService.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortalAdministrationService.java&r1=752027&r2=752052&rev=752052&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortalAdministrationService.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortalAdministrationService.java Tue Mar 10 10:46:22 2009
@@ -15,10 +15,11 @@
  * 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.List;
 
+
 /**
  * Provides callback for executing portal administration
  * tasks within the portlet environment.  This is key for

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortalAdministrationService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortalAdministrationService.java
------------------------------------------------------------------------------
    svn:keywords = Id Author Date Rev

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletContextService.java (from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletContextService.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletContextService.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletContextService.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletContextService.java&r1=752027&r2=752052&rev=752052&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletContextService.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletContextService.java Tue Mar 10 10:46:22 2009
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package org.apache.pluto.container.spi.optional;
+package org.apache.pluto.container.driver;
 
 import java.util.Iterator;
 
 import javax.servlet.ServletConfig;
 
-import org.apache.pluto.container.InternalPortletConfig;
-import org.apache.pluto.container.InternalPortletContext;
+import org.apache.pluto.container.ContainerPortletConfig;
+import org.apache.pluto.container.ContainerPortletContext;
 import org.apache.pluto.container.PortletContainerException;
 import org.apache.pluto.container.PortletWindow;
 
@@ -45,7 +45,7 @@
      *
      * @return iterator of all application descriptors.
      */
-    Iterator<InternalPortletContext> getPortletContexts();
+    Iterator<ContainerPortletContext> getPortletContexts();
 
     /**
      * Retrieve the InternalPortletContext for the specified portlet application name
@@ -53,7 +53,7 @@
      * @param applicationName portlet application name
      * @return portlet context or null if not registered
      */
-    InternalPortletContext getPortletContext(String applicationName)
+    ContainerPortletContext getPortletContext(String applicationName)
         throws PortletContainerException;
 
     /**
@@ -62,7 +62,7 @@
      * @param portletWindow portlet window
      * @return portlet context or null if not registered
      */
-    InternalPortletContext getPortletContext(PortletWindow portletWindow)
+    ContainerPortletContext getPortletContext(PortletWindow portletWindow)
         throws PortletContainerException;
 
     /**
@@ -72,7 +72,7 @@
      * @return portletconfig
      * @throws PortletContainerException if portlet or application unknown
      */
-    InternalPortletConfig getPortletConfig(String applicationName, String portletName)
+    ContainerPortletConfig getPortletConfig(String applicationName, String portletName)
         throws PortletContainerException;
 
     /**
@@ -97,5 +97,5 @@
      * 
      * @param context
      */
-    void unregister(InternalPortletContext context);
+    void unregister(ContainerPortletContext context);
 }

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletContextService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletContextService.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletContextService.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletInvocationEvent.java (from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletInvocationEvent.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletInvocationEvent.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletInvocationEvent.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletInvocationEvent.java&r1=752027&r2=752052&rev=752052&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletInvocationEvent.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletInvocationEvent.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 javax.portlet.PortletRequest;
 

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletInvocationEvent.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletInvocationEvent.java
------------------------------------------------------------------------------
    svn:keywords = Id Author Date Rev

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletInvocationListener.java (from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletInvocationListener.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletInvocationListener.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletInvocationListener.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletInvocationListener.java&r1=752027&r2=752052&rev=752052&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletInvocationListener.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletInvocationListener.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;
 
 
 public interface PortletInvocationListener {

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletInvocationListener.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletInvocationListener.java
------------------------------------------------------------------------------
    svn:keywords = Id Author Date Rev

Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletRegistryEvent.java (from r752027, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRegistryEvent.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletRegistryEvent.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletRegistryEvent.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRegistryEvent.java&r1=752027&r2=752052&rev=752052&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRegistryEvent.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletRegistryEvent.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 org.apache.pluto.container.om.portlet.PortletApplicationDefinition;
 

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletRegistryEvent.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/driver/PortletRegistryEvent.java
------------------------------------------------------------------------------
    svn:keywords = Id Author Date Rev



Mime
View raw message