svn commit: r752055 [1/2] - in /portals/pluto/trunk: pluto-container/src/main/java/org/apache/pluto/core/ pluto-container/src/main/java/org/apache/pluto/descriptors/services/jaxb/ pluto-container/src/main/java/org/apache/pluto/internal/impl/ pluto-cont...

[at...@apache.org]

Author: ate
Date: Tue Mar 10 10:49:10 2009
New Revision: 752055

URL: http://svn.apache.org/viewvc?rev=752055&view=rev
Log:
PLUTO-537: Cleaning up Pluto packages
See: https://issues.apache.org/jira/browse/PLUTO-537
- changes which should have gone together with the previous commit, r752052

Modified:
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/ContainerInvocationServiceImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultOptionalContainerServices.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortalAdministrationService.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletEnvironmentService.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletInfoService.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletInvokerService.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletPreferencesService.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletRequestContextService.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultUserInfoService.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DummyCCPPProfileServiceImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PlutoContainerServices.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletContainerImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletContextManager.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletDescriptorRegistry.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/services/jaxb/PortletAppDescriptorServiceImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ActionRequestImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ActionResponseImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ClientDataRequestImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/EventRequestImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/EventResponseImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/HttpServletPortletRequestWrapper.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/MimeResponseImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletConfigImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletContextImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletPreferenceImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletPreferencesImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestDispatcherImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletResponseImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletURLImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/RenderRequestImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/RenderResponseImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceBundleFactory.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceRequestImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceResponseImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/StateAwareResponseImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletActionResponseContextImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletEventResponseContextImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletMimeResponseContextImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletRenderResponseContextImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletRequestContextImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletResourceRequestContextImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletResourceResponseContextImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletResponseContextImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletStateAwareResponseContextImpl.java
    portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/PortletRequestImplTest.java
    portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/PlutoTestCase.java
    portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/config/impl/DriverConfigurationImpl.java
    portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.java
    portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventProviderImpl.java
    portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/FilterManagerImpl.java
    portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortalCallbackServiceImpl.java
    portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLListenerImpl.java
    portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLProviderImpl.java
    portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletWindowThread.java
    portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/ResourceURLProviderImpl.java
    portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedModesServiceImpl.java
    portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedWindowStateServiceImpl.java
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/DriverConfiguration.java
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/ResourceURLProviderImpl.java
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletTitleTag.java
    portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/ComplexEarAssemblerTest.java
    portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/EarAssemblerTest.java
    portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/io/AssemblyStreamTest.java

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/ContainerInvocationServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/ContainerInvocationServiceImpl.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/ContainerInvocationServiceImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/ContainerInvocationServiceImpl.java Tue Mar 10 10:49:10 2009
@@ -1,9 +1,9 @@
 package org.apache.pluto.core;
 
 import org.apache.pluto.container.ContainerInvocation;
+import org.apache.pluto.container.ContainerInvocationService;
 import org.apache.pluto.container.PortletContainer;
 import org.apache.pluto.container.PortletWindow;
-import org.apache.pluto.container.spi.ContainerInvocationService;
 
 
 public class ContainerInvocationServiceImpl implements

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultOptionalContainerServices.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultOptionalContainerServices.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultOptionalContainerServices.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultOptionalContainerServices.java Tue Mar 10 10:49:10 2009
@@ -18,16 +18,16 @@
 
 import org.apache.pluto.container.NamespaceMapper;
 import org.apache.pluto.container.OptionalContainerServices;
-import org.apache.pluto.container.services.PortletAppDescriptorService;
-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.PortletAppDescriptorService;
+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;
+import org.apache.pluto.container.driver.PortalAdministrationService;
+import org.apache.pluto.container.driver.PortletContextService;
+import org.apache.pluto.container.driver.PortletRegistryService;
 import org.apache.pluto.descriptors.services.jaxb.PortletAppDescriptorServiceImpl;
 
 /**

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortalAdministrationService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortalAdministrationService.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortalAdministrationService.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortalAdministrationService.java Tue Mar 10 10:49:10 2009
@@ -20,9 +20,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.pluto.container.spi.optional.AdministrativeRequestListener;
-import org.apache.pluto.container.spi.optional.PortalAdministrationService;
-import org.apache.pluto.container.spi.optional.PortletInvocationListener;
+import org.apache.pluto.container.driver.AdministrativeRequestListener;
+import org.apache.pluto.container.driver.PortalAdministrationService;
+import org.apache.pluto.container.driver.PortletInvocationListener;
 
 public class DefaultPortalAdministrationService implements PortalAdministrationService 
 {

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletEnvironmentService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletEnvironmentService.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletEnvironmentService.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletEnvironmentService.java Tue Mar 10 10:49:10 2009
@@ -31,14 +31,14 @@
 import javax.portlet.ResourceResponse;
 import javax.servlet.http.HttpSession;
 
+import org.apache.pluto.container.PortletActionResponseContext;
+import org.apache.pluto.container.PortletEnvironmentService;
+import org.apache.pluto.container.PortletEventResponseContext;
+import org.apache.pluto.container.PortletRenderResponseContext;
+import org.apache.pluto.container.PortletRequestContext;
+import org.apache.pluto.container.PortletResourceRequestContext;
+import org.apache.pluto.container.PortletResourceResponseContext;
 import org.apache.pluto.container.PortletWindow;
-import org.apache.pluto.container.spi.optional.PortletActionResponseContext;
-import org.apache.pluto.container.spi.optional.PortletEnvironmentService;
-import org.apache.pluto.container.spi.optional.PortletEventResponseContext;
-import org.apache.pluto.container.spi.optional.PortletRenderResponseContext;
-import org.apache.pluto.container.spi.optional.PortletRequestContext;
-import org.apache.pluto.container.spi.optional.PortletResourceRequestContext;
-import org.apache.pluto.container.spi.optional.PortletResourceResponseContext;
 import org.apache.pluto.internal.impl.ActionRequestImpl;
 import org.apache.pluto.internal.impl.ActionResponseImpl;
 import org.apache.pluto.internal.impl.EventRequestImpl;

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletInfoService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletInfoService.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletInfoService.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletInfoService.java Tue Mar 10 10:49:10 2009
@@ -17,9 +17,9 @@
  */
 package org.apache.pluto.core;
 
+import org.apache.pluto.container.PortletInfoService;
 import org.apache.pluto.container.PortletWindow;
 import org.apache.pluto.container.om.portlet.PortletInfo;
-import org.apache.pluto.container.spi.optional.PortletInfoService;
 
 
 public class DefaultPortletInfoService implements PortletInfoService {

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletInvokerService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletInvokerService.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletInvokerService.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletInvokerService.java Tue Mar 10 10:49:10 2009
@@ -38,13 +38,13 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.pluto.container.Constants;
+import org.apache.pluto.container.FilterManager;
 import org.apache.pluto.container.PortletContainerException;
+import org.apache.pluto.container.PortletInvokerService;
+import org.apache.pluto.container.PortletRequestContext;
 import org.apache.pluto.container.PortletWindow;
+import org.apache.pluto.container.driver.PortletContextService;
 import org.apache.pluto.container.driver.PortletServlet;
-import org.apache.pluto.container.spi.FilterManager;
-import org.apache.pluto.container.spi.optional.PortletContextService;
-import org.apache.pluto.container.spi.optional.PortletInvokerService;
-import org.apache.pluto.container.spi.optional.PortletRequestContext;
 import org.apache.pluto.util.StringManager;
 
 /**

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletPreferencesService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletPreferencesService.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletPreferencesService.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletPreferencesService.java Tue Mar 10 10:49:10 2009
@@ -26,13 +26,13 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.pluto.container.InternalPortletPreference;
+import org.apache.pluto.container.PortletPreference;
 import org.apache.pluto.container.PortletContainerException;
+import org.apache.pluto.container.PortletPreferencesService;
 import org.apache.pluto.container.PortletWindow;
 import org.apache.pluto.container.om.portlet.PortletDefinition;
 import org.apache.pluto.container.om.portlet.Preference;
 import org.apache.pluto.container.om.portlet.Preferences;
-import org.apache.pluto.container.spi.optional.PortletPreferencesService;
 import org.apache.pluto.internal.impl.PortletPreferenceImpl;
 
 /**
@@ -58,7 +58,7 @@
 	 * The in-memory portlet preferences storage: key is the preference name as
 	 * a string, value is an array of PortletPreference objects.
 	 */
-	private Map<String,Map<String,InternalPortletPreference>> storage = new HashMap<String,Map<String,InternalPortletPreference>>();
+	private Map<String,Map<String,PortletPreference>> storage = new HashMap<String,Map<String,PortletPreference>>();
 
    /**
      * The preferences validator cache: key is the portlet definition, value is
@@ -101,14 +101,14 @@
      * 
      * @see org.apache.pluto.descriptors.portlet.PreferenceType
      */
-    public Map<String,InternalPortletPreference> getDefaultPreferences( PortletWindow portletWindow,
+    public Map<String,PortletPreference> getDefaultPreferences( PortletWindow portletWindow,
                                                               PortletRequest request )
       throws PortletContainerException {
-        Map<String,InternalPortletPreference> preferences = null;
+        Map<String,PortletPreference> preferences = null;
         PortletDefinition portlet = portletWindow.getPortletEntity().getPortletDefinition();
         Preferences prefs = portlet.getPortletPreferences();
         if (prefs != null && prefs.getPortletPreferences() != null) {
-            preferences = new HashMap<String,InternalPortletPreference>(prefs.getPortletPreferences().size());
+            preferences = new HashMap<String,PortletPreference>(prefs.getPortletPreferences().size());
             for (Preference pref : prefs.getPortletPreferences()) {
                 String[] values = null;
                 if (pref.getValues() != null && pref.getValues().size() > 0) {
@@ -130,12 +130,12 @@
 	 * @return a copy of the stored portlet preferences map.
 	 * @throws PortletContainerException
 	 */
-	public Map<String,InternalPortletPreference> getStoredPreferences(
+	public Map<String,PortletPreference> getStoredPreferences(
 			PortletWindow portletWindow,
 			PortletRequest request)
 	throws PortletContainerException {
         String key = getFormattedKey(portletWindow, request);
-        Map<String,InternalPortletPreference> preferences = storage.get(key);
+        Map<String,PortletPreference> preferences = storage.get(key);
         if (preferences == null) {
             if (LOG.isDebugEnabled()) {
                 LOG.debug("No portlet preferences found for: " + key);
@@ -168,7 +168,7 @@
 	 */
     public void store(PortletWindow portletWindow,
                       PortletRequest request,
-                      Map<String,InternalPortletPreference> preferences)
+                      Map<String,PortletPreference> preferences)
     throws PortletContainerException {
         String key = getFormattedKey(portletWindow, request);
         storage.put(key, clonePreferences(preferences));
@@ -203,14 +203,14 @@
      * @param preferences  the portlet preferences map to clone.
      * @return a deep-cloned copy of the portlet preferences map.
      */
-    private Map<String,InternalPortletPreference> clonePreferences(
-    		Map <String,InternalPortletPreference> preferences) {
+    private Map<String,PortletPreference> clonePreferences(
+    		Map <String,PortletPreference> preferences) {
     	if (preferences == null) {
     		return null;
     	}
-    	Map <String,InternalPortletPreference> copy =
-    			new HashMap<String,InternalPortletPreference>(preferences.size());
-    	for (InternalPortletPreference p : preferences.values()) {
+    	Map <String,PortletPreference> copy =
+    			new HashMap<String,PortletPreference>(preferences.size());
+    	for (PortletPreference p : preferences.values()) {
     	    copy.put(p.getName(), p.clone());
     	}
     	return copy;

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletRequestContextService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletRequestContextService.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletRequestContextService.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletRequestContextService.java Tue Mar 10 10:49:10 2009
@@ -20,15 +20,15 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.pluto.container.PortletActionResponseContext;
 import org.apache.pluto.container.PortletContainer;
+import org.apache.pluto.container.PortletEventResponseContext;
+import org.apache.pluto.container.PortletRenderResponseContext;
+import org.apache.pluto.container.PortletRequestContext;
+import org.apache.pluto.container.PortletRequestContextService;
+import org.apache.pluto.container.PortletResourceRequestContext;
+import org.apache.pluto.container.PortletResourceResponseContext;
 import org.apache.pluto.container.PortletWindow;
-import org.apache.pluto.container.spi.optional.PortletActionResponseContext;
-import org.apache.pluto.container.spi.optional.PortletEventResponseContext;
-import org.apache.pluto.container.spi.optional.PortletRenderResponseContext;
-import org.apache.pluto.container.spi.optional.PortletRequestContext;
-import org.apache.pluto.container.spi.optional.PortletRequestContextService;
-import org.apache.pluto.container.spi.optional.PortletResourceRequestContext;
-import org.apache.pluto.container.spi.optional.PortletResourceResponseContext;
 import org.apache.pluto.spi.impl.PortletRenderResponseContextImpl;
 import org.apache.pluto.spi.impl.PortletActionResponseContextImpl;
 import org.apache.pluto.spi.impl.PortletEventResponseContextImpl;

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultUserInfoService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultUserInfoService.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultUserInfoService.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultUserInfoService.java Tue Mar 10 10:49:10 2009
@@ -24,7 +24,7 @@
 
 import org.apache.pluto.container.PortletContainerException;
 import org.apache.pluto.container.PortletWindow;
-import org.apache.pluto.container.spi.optional.UserInfoService;
+import org.apache.pluto.container.UserInfoService;
 
 /**
  * UserInfo

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DummyCCPPProfileServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DummyCCPPProfileServiceImpl.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DummyCCPPProfileServiceImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DummyCCPPProfileServiceImpl.java Tue Mar 10 10:49:10 2009
@@ -6,7 +6,7 @@
 import javax.ccpp.Profile;
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.pluto.container.spi.CCPPProfileService;
+import org.apache.pluto.container.CCPPProfileService;
 import org.apache.pluto.internal.impl.DummyProfile;
 
 /**

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PlutoContainerServices.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PlutoContainerServices.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PlutoContainerServices.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PlutoContainerServices.java Tue Mar 10 10:49:10 2009
@@ -18,23 +18,23 @@
 
 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.OptionalContainerServices;
+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.RequiredContainerServices;
-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.UserInfoService;
+import org.apache.pluto.container.driver.PortalAdministrationService;
+import org.apache.pluto.container.driver.PortletContextService;
+import org.apache.pluto.container.driver.PortletRegistryService;
 
 
 public class PlutoContainerServices implements ContainerServices

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletContainerImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletContainerImpl.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletContainerImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletContainerImpl.java Tue Mar 10 10:49:10 2009
@@ -36,24 +36,24 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.pluto.container.Constants;
+import org.apache.pluto.container.ContainerInvocationService;
 import org.apache.pluto.container.EventContainer;
+import org.apache.pluto.container.FilterManager;
 import org.apache.pluto.container.OptionalContainerServices;
+import org.apache.pluto.container.PortletActionResponseContext;
 import org.apache.pluto.container.PortletContainer;
 import org.apache.pluto.container.PortletContainerException;
 import org.apache.pluto.container.PortletEntity;
+import org.apache.pluto.container.PortletEnvironmentService;
+import org.apache.pluto.container.PortletEventResponseContext;
+import org.apache.pluto.container.PortletInvokerService;
+import org.apache.pluto.container.PortletRenderResponseContext;
+import org.apache.pluto.container.PortletRequestContext;
+import org.apache.pluto.container.PortletRequestContextService;
+import org.apache.pluto.container.PortletResourceRequestContext;
+import org.apache.pluto.container.PortletResourceResponseContext;
 import org.apache.pluto.container.PortletWindow;
 import org.apache.pluto.container.RequiredContainerServices;
-import org.apache.pluto.container.spi.ContainerInvocationService;
-import org.apache.pluto.container.spi.FilterManager;
-import org.apache.pluto.container.spi.optional.PortletActionResponseContext;
-import org.apache.pluto.container.spi.optional.PortletEnvironmentService;
-import org.apache.pluto.container.spi.optional.PortletEventResponseContext;
-import org.apache.pluto.container.spi.optional.PortletInvokerService;
-import org.apache.pluto.container.spi.optional.PortletRenderResponseContext;
-import org.apache.pluto.container.spi.optional.PortletRequestContext;
-import org.apache.pluto.container.spi.optional.PortletRequestContextService;
-import org.apache.pluto.container.spi.optional.PortletResourceRequestContext;
-import org.apache.pluto.container.spi.optional.PortletResourceResponseContext;
 import org.apache.pluto.util.StringManager;
 
 

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletContextManager.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletContextManager.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletContextManager.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletContextManager.java Tue Mar 10 10:49:10 2009
@@ -30,16 +30,16 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-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;
+import org.apache.pluto.container.driver.PortletContextService;
+import org.apache.pluto.container.driver.PortletRegistryEvent;
+import org.apache.pluto.container.driver.PortletRegistryListener;
+import org.apache.pluto.container.driver.PortletRegistryService;
 import org.apache.pluto.container.om.portlet.PortletApplicationDefinition;
 import org.apache.pluto.container.om.portlet.PortletDefinition;
-import org.apache.pluto.container.spi.optional.PortletContextService;
-import org.apache.pluto.container.spi.optional.PortletRegistryEvent;
-import org.apache.pluto.container.spi.optional.PortletRegistryListener;
-import org.apache.pluto.container.spi.optional.PortletRegistryService;
 import org.apache.pluto.internal.impl.Configuration;
 import org.apache.pluto.internal.impl.PortletConfigImpl;
 import org.apache.pluto.internal.impl.PortletContextImpl;
@@ -63,7 +63,7 @@
      * The PortletContext cache map: key is servlet context, and value is the
      * associated portlet context.
      */
-    private Map<String,InternalPortletContext> portletContexts = new HashMap<String,InternalPortletContext>();
+    private Map<String,ContainerPortletContext> portletContexts = new HashMap<String,ContainerPortletContext>();
 
     /**
      * List of application id resolvers. *
@@ -77,7 +77,7 @@
      * The PortletContext cache map: key is servlet context, and value is the
      * associated portlet context.
      */
-    private final Map<String,InternalPortletConfig> portletConfigs = new HashMap<String,InternalPortletConfig>();
+    private final Map<String,ContainerPortletConfig> portletConfigs = new HashMap<String,ContainerPortletConfig>();
 
 
     /**
@@ -120,7 +120,7 @@
             PortletApplicationDefinition portletApp = portletRegistry.getPortletAppDD(servletContext);
             portletApp.setName(applicationName);
 
-            InternalPortletContext portletContext = new PortletContextImpl(servletContext, portletApp);
+            ContainerPortletContext portletContext = new PortletContextImpl(servletContext, portletApp);
 
             portletContexts.put(applicationName, portletContext);
 
@@ -148,9 +148,9 @@
     }
 
     /**
-     * @see org.apache.pluto.container.spi.optional.PortletContextService#unregister(org.apache.pluto.container.InternalPortletContext)
+     * @see org.apache.pluto.container.driver.PortletContextService#unregister(org.apache.pluto.container.ContainerPortletContext)
      */
-    public void unregister(InternalPortletContext context) {
+    public void unregister(ContainerPortletContext context) {
         portletContexts.remove(context.getApplicationName());
         classLoaders.remove(context.getApplicationName());
         Iterator<String> configs = portletConfigs.keySet().iterator();
@@ -164,39 +164,39 @@
     }
 
     /**
-     * @see org.apache.pluto.container.spi.optional.PortletRegistryService#getRegisteredPortletApplicationNames()
+     * @see org.apache.pluto.container.driver.PortletRegistryService#getRegisteredPortletApplicationNames()
      */
     public Iterator<String> getRegisteredPortletApplicationNames() {
         return new HashSet<String>(portletContexts.keySet()).iterator();
     }
 
     /**
-     * @see org.apache.pluto.container.spi.optional.PortletContextService#getPortletContexts()
+     * @see org.apache.pluto.container.driver.PortletContextService#getPortletContexts()
      */
-    public Iterator<InternalPortletContext> getPortletContexts() {
-        return new HashSet<InternalPortletContext>(portletContexts.values()).iterator();
+    public Iterator<ContainerPortletContext> getPortletContexts() {
+        return new HashSet<ContainerPortletContext>(portletContexts.values()).iterator();
     }
 
     /**
-     * @see org.apache.pluto.container.spi.optional.PortletContextService#getPortletContext(java.lang.String)
+     * @see org.apache.pluto.container.driver.PortletContextService#getPortletContext(java.lang.String)
      */
-    public InternalPortletContext getPortletContext(String applicationName) {
+    public ContainerPortletContext getPortletContext(String applicationName) {
         return portletContexts.get(applicationName);
     }
 
     /**
-     * @see org.apache.pluto.container.spi.optional.PortletContextService#getPortletContext(org.apache.pluto.container.PortletWindow)
+     * @see org.apache.pluto.container.driver.PortletContextService#getPortletContext(org.apache.pluto.container.PortletWindow)
      */
-    public InternalPortletContext getPortletContext(PortletWindow portletWindow) throws PortletContainerException {
+    public ContainerPortletContext getPortletContext(PortletWindow portletWindow) throws PortletContainerException {
         return portletContexts.get(portletWindow.getPortletEntity().getPortletDefinition().getApplication().getName());
     }
 
 
     /**
-     * @see org.apache.pluto.container.spi.optional.PortletContextService#getPortletConfig(java.lang.String, java.lang.String)
+     * @see org.apache.pluto.container.driver.PortletContextService#getPortletConfig(java.lang.String, java.lang.String)
      */
-    public InternalPortletConfig getPortletConfig(String applicationName, String portletName) throws PortletContainerException {
-        InternalPortletConfig ipc = portletConfigs.get(applicationName + "/" + portletName);
+    public ContainerPortletConfig getPortletConfig(String applicationName, String portletName) throws PortletContainerException {
+        ContainerPortletConfig ipc = portletConfigs.get(applicationName + "/" + portletName);
         if (ipc != null) {
             return ipc;
         }
@@ -206,10 +206,10 @@
     }
 
     /**
-     * @see org.apache.pluto.container.spi.optional.PortletRegistryService#getPortlet(java.lang.String, java.lang.String)
+     * @see org.apache.pluto.container.driver.PortletRegistryService#getPortlet(java.lang.String, java.lang.String)
      */
     public PortletDefinition getPortlet(String applicationName, String portletName) throws PortletContainerException {
-        InternalPortletConfig ipc = portletConfigs.get(applicationName + "/" + portletName);
+        ContainerPortletConfig ipc = portletConfigs.get(applicationName + "/" + portletName);
         if (ipc != null) {
             return ipc.getPortletDefinition();
         }
@@ -219,10 +219,10 @@
     }
 
     /**
-     * @see org.apache.pluto.container.spi.optional.PortletRegistryService#getPortletApplication(java.lang.String)
+     * @see org.apache.pluto.container.driver.PortletRegistryService#getPortletApplication(java.lang.String)
      */
     public PortletApplicationDefinition getPortletApplication(String applicationName) throws PortletContainerException {
-        InternalPortletContext ipc = portletContexts.get(applicationName);
+        ContainerPortletContext ipc = portletContexts.get(applicationName);
         if (ipc != null) {
             return ipc.getPortletApplicationDefinition();
         }
@@ -232,27 +232,27 @@
     }
 
     /**
-     * @see org.apache.pluto.container.spi.optional.PortletContextService#getClassLoader(java.lang.String)
+     * @see org.apache.pluto.container.driver.PortletContextService#getClassLoader(java.lang.String)
      */
     public ClassLoader getClassLoader(String applicationName){
     	return classLoaders.get(applicationName);
     }
 
     /**
-     * @see org.apache.pluto.container.spi.optional.PortletRegistryService#addPortletRegistryListener(org.apache.pluto.container.spi.optional.PortletRegistryListener)
+     * @see org.apache.pluto.container.driver.PortletRegistryService#addPortletRegistryListener(org.apache.pluto.container.driver.PortletRegistryListener)
      */
     public void addPortletRegistryListener(PortletRegistryListener listener) {
         registryListeners.add(listener);
     }
 
     /**
-     * @see org.apache.pluto.container.spi.optional.PortletRegistryService#removePortletRegistryListener(org.apache.pluto.container.spi.optional.PortletRegistryListener)
+     * @see org.apache.pluto.container.driver.PortletRegistryService#removePortletRegistryListener(org.apache.pluto.container.driver.PortletRegistryListener)
      */
     public void removePortletRegistryListener(PortletRegistryListener listener) {
         registryListeners.remove(listener);
     }
 
-    private void fireRegistered(InternalPortletContext context) {
+    private void fireRegistered(ContainerPortletContext context) {
         PortletRegistryEvent event = new PortletRegistryEvent();
         event.setPortletApplication(context.getPortletApplicationDefinition());
 
@@ -262,7 +262,7 @@
         LOG.info("Portlet Context '/" + context.getApplicationName() + "' registered.");
     }
 
-    private void fireRemoved(InternalPortletContext context) {
+    private void fireRemoved(ContainerPortletContext context) {
         PortletRegistryEvent event = new PortletRegistryEvent();
         event.setPortletApplication(context.getPortletApplicationDefinition());
 

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletDescriptorRegistry.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletDescriptorRegistry.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletDescriptorRegistry.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletDescriptorRegistry.java Tue Mar 10 10:49:10 2009
@@ -22,10 +22,10 @@
 
 import javax.servlet.ServletContext;
 
-import org.apache.pluto.container.PlutoConfigurationException;
+import org.apache.pluto.container.PortletAppDescriptorService;
 import org.apache.pluto.container.PortletContainerException;
+import org.apache.pluto.container.driver.PlutoConfigurationException;
 import org.apache.pluto.container.om.portlet.PortletApplicationDefinition;
-import org.apache.pluto.container.services.PortletAppDescriptorService;
 import org.apache.pluto.util.StringManager;
 
 /**

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/services/jaxb/PortletAppDescriptorServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/services/jaxb/PortletAppDescriptorServiceImpl.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/services/jaxb/PortletAppDescriptorServiceImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/services/jaxb/PortletAppDescriptorServiceImpl.java Tue Mar 10 10:49:10 2009
@@ -19,8 +19,8 @@
 import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathFactory;
 
+import org.apache.pluto.container.PortletAppDescriptorService;
 import org.apache.pluto.container.om.portlet.PortletApplicationDefinition;
-import org.apache.pluto.container.services.PortletAppDescriptorService;
 import org.apache.pluto.descriptors.portlet.PortletAppType;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ActionRequestImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ActionRequestImpl.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ActionRequestImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ActionRequestImpl.java Tue Mar 10 10:49:10 2009
@@ -19,7 +19,7 @@
 import javax.portlet.ActionRequest;
 import javax.portlet.PortletRequest;
 
-import org.apache.pluto.container.spi.optional.PortletRequestContext;
+import org.apache.pluto.container.PortletRequestContext;
 
 /**
  * Implementation of the <code>javax.portlet.ActionRequest</code> interface.

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ActionResponseImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ActionResponseImpl.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ActionResponseImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ActionResponseImpl.java Tue Mar 10 10:49:10 2009
@@ -20,9 +20,9 @@
 
 import javax.portlet.ActionResponse;
 
-import org.apache.pluto.container.spi.PortalCallbackService;
-import org.apache.pluto.container.spi.ResourceURLProvider;
-import org.apache.pluto.container.spi.optional.PortletActionResponseContext;
+import org.apache.pluto.container.PortalCallbackService;
+import org.apache.pluto.container.PortletActionResponseContext;
+import org.apache.pluto.container.ResourceURLProvider;
 import org.apache.pluto.util.ArgumentUtility;
 
 public class ActionResponseImpl extends StateAwareResponseImpl implements ActionResponse

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ClientDataRequestImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ClientDataRequestImpl.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ClientDataRequestImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ClientDataRequestImpl.java Tue Mar 10 10:49:10 2009
@@ -24,7 +24,7 @@
 
 import javax.portlet.ClientDataRequest;
 
-import org.apache.pluto.container.spi.optional.PortletRequestContext;
+import org.apache.pluto.container.PortletRequestContext;
 
 /**
  * Implementation of the <code>javax.portlet.ClientDataRequest</code> interface.

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/EventRequestImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/EventRequestImpl.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/EventRequestImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/EventRequestImpl.java Tue Mar 10 10:49:10 2009
@@ -21,7 +21,7 @@
 import javax.portlet.EventRequest;
 import javax.portlet.PortletRequest;
 
-import org.apache.pluto.container.spi.optional.PortletRequestContext;
+import org.apache.pluto.container.PortletRequestContext;
 
 /**
  * <code>javax.portlet.EventRequest</code> implementation.

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/EventResponseImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/EventResponseImpl.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/EventResponseImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/EventResponseImpl.java Tue Mar 10 10:49:10 2009
@@ -21,8 +21,8 @@
 import javax.portlet.EventRequest;
 import javax.portlet.EventResponse;
 
-import org.apache.pluto.container.spi.optional.PortletEventResponseContext;
-import org.apache.pluto.container.spi.optional.PortletStateAwareResponseContext;
+import org.apache.pluto.container.PortletEventResponseContext;
+import org.apache.pluto.container.PortletStateAwareResponseContext;
 import org.apache.pluto.util.ArgumentUtility;
 
 /**

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/HttpServletPortletRequestWrapper.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/HttpServletPortletRequestWrapper.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/HttpServletPortletRequestWrapper.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/HttpServletPortletRequestWrapper.java Tue Mar 10 10:49:10 2009
@@ -40,8 +40,8 @@
 import javax.servlet.http.HttpSession;
 
 import org.apache.pluto.container.Constants;
+import org.apache.pluto.container.PortletRequestContext;
 import org.apache.pluto.container.RequestDispatcherPathInfo;
-import org.apache.pluto.container.spi.optional.PortletRequestContext;
 
 /**
  * @author <a href="mailto:ate@douma.nu">Ate Douma</a>

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/MimeResponseImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/MimeResponseImpl.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/MimeResponseImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/MimeResponseImpl.java Tue Mar 10 10:49:10 2009
@@ -29,9 +29,9 @@
 import javax.portlet.PortletURL;
 import javax.portlet.ResourceURL;
 
+import org.apache.pluto.container.PortletMimeResponseContext;
 import org.apache.pluto.container.om.portlet.PortletDefinition;
 import org.apache.pluto.container.om.portlet.Supports;
-import org.apache.pluto.container.spi.optional.PortletMimeResponseContext;
 
 public class MimeResponseImpl extends PortletResponseImpl implements MimeResponse
 {

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletConfigImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletConfigImpl.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletConfigImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletConfigImpl.java Tue Mar 10 10:49:10 2009
@@ -32,22 +32,22 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-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.om.portlet.ContainerRuntimeOption;
 import org.apache.pluto.container.om.portlet.EventDefinitionReference;
 import org.apache.pluto.container.om.portlet.InitParam;
 import org.apache.pluto.container.om.portlet.PortletApplicationDefinition;
 import org.apache.pluto.container.om.portlet.PortletDefinition;
 
-public class PortletConfigImpl implements PortletConfig, InternalPortletConfig {
+public class PortletConfigImpl implements PortletConfig, ContainerPortletConfig {
 
     private static final Log LOG = LogFactory.getLog(PortletConfigImpl.class);
 
     /**
      * The Portlet Application Context within which we exist.
      */
-    protected InternalPortletContext portletContext;
+    protected ContainerPortletContext portletContext;
 
     /**
      * The portlet descriptor.
@@ -63,7 +63,7 @@
     
     protected Map<String, String[]> containerRuntimeOptions;
 
-    public PortletConfigImpl(InternalPortletContext portletContext,
+    public PortletConfigImpl(ContainerPortletContext portletContext,
                              PortletDefinition portletDD,
                              PortletApplicationDefinition portletAppDD) {
         this.portletContext = portletContext;
@@ -75,7 +75,7 @@
         return portlet.getPortletName();
     }
 
-    public InternalPortletContext getPortletContext() {
+    public ContainerPortletContext getPortletContext() {
         return portletContext;
     }
 

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletContextImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletContextImpl.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletContextImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletContextImpl.java Tue Mar 10 10:49:10 2009
@@ -32,7 +32,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.pluto.container.InternalPortletContext;
+import org.apache.pluto.container.ContainerPortletContext;
 import org.apache.pluto.container.RequestDispatcherPathInfo;
 import org.apache.pluto.container.om.portlet.PortletApplicationDefinition;
 
@@ -44,7 +44,7 @@
  * @version 1.1
  */
 public class PortletContextImpl
-implements PortletContext, InternalPortletContext {
+implements PortletContext, ContainerPortletContext {
 	
 	/**
 	 *  Logger.

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletPreferenceImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletPreferenceImpl.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletPreferenceImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletPreferenceImpl.java Tue Mar 10 10:49:10 2009
@@ -16,14 +16,14 @@
  */
 package org.apache.pluto.internal.impl;
 
-import org.apache.pluto.container.InternalPortletPreference;
+import org.apache.pluto.container.PortletPreference;
 
 /**
  * TODO: javadoc
  * @version 1.0
  * @since Sep 20, 2004
  */
-public class PortletPreferenceImpl implements InternalPortletPreference {
+public class PortletPreferenceImpl implements PortletPreference {
 
 	// Private Member Variables ------------------------------------------------
 
@@ -89,7 +89,7 @@
         this.readOnly = readOnly;
     }
 
-    public InternalPortletPreference clone() {
+    public PortletPreference clone() {
     	PortletPreferenceImpl copy = new PortletPreferenceImpl();
     	copy.name = this.name;
     	if (this.values != null) {

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletPreferencesImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletPreferencesImpl.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletPreferencesImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletPreferencesImpl.java Tue Mar 10 10:49:10 2009
@@ -31,12 +31,12 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.pluto.container.InternalPortletPreference;
+import org.apache.pluto.container.PortletPreference;
 import org.apache.pluto.container.PortletContainer;
 import org.apache.pluto.container.PortletContainerException;
+import org.apache.pluto.container.PortletPreferencesService;
 import org.apache.pluto.container.PortletWindow;
 import org.apache.pluto.container.om.portlet.PortletDefinition;
-import org.apache.pluto.container.spi.optional.PortletPreferencesService;
 import org.apache.pluto.util.StringManager;
 
 /**
@@ -68,13 +68,13 @@
      * Default portlet preferences retrieved from portlet.xml, and used for
      * resetting portlet preferences.
      */
-    private Map<String,InternalPortletPreference> defaultPreferences;
+    private Map<String,PortletPreference> defaultPreferences;
     
     /**
      * Current portlet preferences: key is the preference name as a string,
      * value is the PortletPreference instance.
      */
-    private final Map<String, InternalPortletPreference> preferences = new HashMap<String, InternalPortletPreference>();
+    private final Map<String, PortletPreference> preferences = new HashMap<String, PortletPreference>();
 
     // Constructor -------------------------------------------------------------
     
@@ -103,7 +103,7 @@
             // Put default portlet preferences into preferences map.
             defaultPreferences = preferencesService.getDefaultPreferences(window, request);
             if (defaultPreferences != null) {
-                for (InternalPortletPreference p : defaultPreferences.values()) {
+                for (PortletPreference p : defaultPreferences.values()) {
                     preferences.put(p.getName(), p.clone());
                 }
             }
@@ -113,7 +113,7 @@
             
             // Merge stored portlet preferences into preferences map.
             
-            Map<String,InternalPortletPreference> storedPreferences = preferencesService
+            Map<String,PortletPreference> storedPreferences = preferencesService
             		.getStoredPreferences(window, request);
             preferences.putAll(storedPreferences);
         	
@@ -134,7 +134,7 @@
             throw new IllegalArgumentException(
             		EXCEPTIONS.getString("error.null", "Preference key "));
         }
-        InternalPortletPreference pref = preferences.get(key);
+        PortletPreference pref = preferences.get(key);
         return (pref != null && pref.isReadOnly());
     }
 
@@ -156,7 +156,7 @@
             		EXCEPTIONS.getString("error.null", "Preference key "));
         }
         String[] values = null;
-        InternalPortletPreference pref = preferences.get(key);
+        PortletPreference pref = preferences.get(key);
         if (pref != null) {
             values = pref.getValues();
         }
@@ -171,7 +171,7 @@
             throw new ReadOnlyException(EXCEPTIONS.getString(
             		"error.preference.readonly", key));
         }
-        InternalPortletPreference pref = preferences.get(key);
+        PortletPreference pref = preferences.get(key);
         if (pref != null) {
             pref.setValues(new String[] { value });
         } else {
@@ -185,7 +185,7 @@
             throw new ReadOnlyException(EXCEPTIONS.getString(
             		"error.preference.readonly"));
         }
-        InternalPortletPreference pref = preferences.get(key);
+        PortletPreference pref = preferences.get(key);
         if (pref != null) {
             pref.setValues(values);
         } else {
@@ -200,7 +200,7 @@
 
     public Map<String,String[]> getMap() {
         Map<String,String[]> map = new HashMap<String,String[]>();
-        for (InternalPortletPreference pref : preferences.values()) {
+        for (PortletPreference pref : preferences.values()) {
             map.put(pref.getName(),
                     pref.getValues() != null ? pref.getValues().clone() : null);
         }
@@ -214,7 +214,7 @@
             		"error.preference.readonly", "Preference key "));
         }
         // Try to reset preference to the default values.
-        InternalPortletPreference p = defaultPreferences.get(key);
+        PortletPreference p = defaultPreferences.get(key);
         if (p != null) {
             if (LOG.isDebugEnabled()) {
                 LOG.debug("Resetting preference for key: " + key);
@@ -295,7 +295,7 @@
     public String toString() {
     	StringBuffer buffer = new StringBuffer();    	
     	buffer.append(getClass().getName()).append("[");
-    	for (InternalPortletPreference p : preferences.values()) {
+    	for (PortletPreference p : preferences.values()) {
             buffer.append(p.getName());
             buffer.append("(readOnly:").append(p.isReadOnly()).append(")=");
             String[] values = p.getValues();

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestDispatcherImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestDispatcherImpl.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestDispatcherImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestDispatcherImpl.java Tue Mar 10 10:49:10 2009
@@ -35,8 +35,8 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.pluto.container.Constants;
+import org.apache.pluto.container.PortletRequestContext;
 import org.apache.pluto.container.RequestDispatcherPathInfo;
-import org.apache.pluto.container.spi.optional.PortletRequestContext;
 
 /**
  * Implementation of the <code>PortletRequestDispatcher</code> interface.

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java Tue Mar 10 10:49:10 2009
@@ -42,16 +42,16 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.pluto.container.Constants;
-import org.apache.pluto.container.InternalPortletContext;
+import org.apache.pluto.container.ContainerPortletContext;
 import org.apache.pluto.container.OptionalContainerServices;
 import org.apache.pluto.container.PortletContainer;
 import org.apache.pluto.container.PortletEntity;
+import org.apache.pluto.container.PortletEnvironmentService;
+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.om.portlet.SecurityRoleRef;
 import org.apache.pluto.container.om.portlet.Supports;
-import org.apache.pluto.container.spi.optional.PortletEnvironmentService;
-import org.apache.pluto.container.spi.optional.PortletRequestContext;
 import org.apache.pluto.util.ArgumentUtility;
 import org.apache.pluto.util.Enumerator;
 import org.apache.pluto.util.StringManager;
@@ -216,7 +216,7 @@
         return requestContext;
     }
 
-    protected InternalPortletContext getPortletContext()
+    protected ContainerPortletContext getPortletContext()
     {
         return requestContext.getPortletConfig().getPortletContext();
     }

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletResponseImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletResponseImpl.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletResponseImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletResponseImpl.java Tue Mar 10 10:49:10 2009
@@ -31,10 +31,10 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.pluto.container.PortletContainer;
+import org.apache.pluto.container.PortletResponseContext;
 import org.apache.pluto.container.PortletWindow;
+import org.apache.pluto.container.ResourceURLProvider;
 import org.apache.pluto.container.om.portlet.Supports;
-import org.apache.pluto.container.spi.ResourceURLProvider;
-import org.apache.pluto.container.spi.optional.PortletResponseContext;
 import org.apache.pluto.util.ArgumentUtility;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Document;

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletURLImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletURLImpl.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletURLImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletURLImpl.java Tue Mar 10 10:49:10 2009
@@ -34,12 +34,12 @@
 import javax.portlet.WindowState;
 import javax.portlet.WindowStateException;
 
+import org.apache.pluto.container.PortletResponseContext;
+import org.apache.pluto.container.PortletURLListener;
+import org.apache.pluto.container.PortletURLProvider;
 import org.apache.pluto.container.om.portlet.PortletApplicationDefinition;
 import org.apache.pluto.container.om.portlet.PortletDefinition;
 import org.apache.pluto.container.om.portlet.Supports;
-import org.apache.pluto.container.spi.PortletURLListener;
-import org.apache.pluto.container.spi.PortletURLProvider;
-import org.apache.pluto.container.spi.optional.PortletResponseContext;
 import org.apache.pluto.util.ArgumentUtility;
 
 /**

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/RenderRequestImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/RenderRequestImpl.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/RenderRequestImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/RenderRequestImpl.java Tue Mar 10 10:49:10 2009
@@ -20,7 +20,7 @@
 import javax.portlet.PortletRequest;
 import javax.portlet.RenderRequest;
 
-import org.apache.pluto.container.spi.optional.PortletRequestContext;
+import org.apache.pluto.container.PortletRequestContext;
 
 /**
  * Implementation of the <code>javax.portlet.RenderRequest</code> interface.

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/RenderResponseImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/RenderResponseImpl.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/RenderResponseImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/RenderResponseImpl.java Tue Mar 10 10:49:10 2009
@@ -22,7 +22,7 @@
 import javax.portlet.PortletMode;
 import javax.portlet.RenderResponse;
 
-import org.apache.pluto.container.spi.optional.PortletRenderResponseContext;
+import org.apache.pluto.container.PortletRenderResponseContext;
 import org.apache.pluto.util.ArgumentUtility;
 import org.apache.pluto.util.StringUtils;
 

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceBundleFactory.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceBundleFactory.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceBundleFactory.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceBundleFactory.java Tue Mar 10 10:49:10 2009
@@ -25,11 +25,11 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.pluto.container.ContainerInvocation;
+import org.apache.pluto.container.PortletInfoService;
 import org.apache.pluto.container.PortletWindow;
 import org.apache.pluto.container.driver.PlutoServices;
 import org.apache.pluto.container.om.portlet.PortletDefinition;
 import org.apache.pluto.container.om.portlet.PortletInfo;
-import org.apache.pluto.container.spi.optional.PortletInfoService;
 import org.apache.pluto.util.StringManager;
 
 /**

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceRequestImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceRequestImpl.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceRequestImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceRequestImpl.java Tue Mar 10 10:49:10 2009
@@ -23,7 +23,7 @@
 import javax.portlet.PortletRequest;
 import javax.portlet.ResourceRequest;
 
-import org.apache.pluto.container.spi.optional.PortletResourceRequestContext;
+import org.apache.pluto.container.PortletResourceRequestContext;
 
 public class ResourceRequestImpl extends ClientDataRequestImpl implements ResourceRequest
 {

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceResponseImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceResponseImpl.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceResponseImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceResponseImpl.java Tue Mar 10 10:49:10 2009
@@ -22,7 +22,7 @@
 import javax.portlet.ResourceResponse;
 import javax.portlet.ResourceURL;
 
-import org.apache.pluto.container.spi.optional.PortletResourceResponseContext;
+import org.apache.pluto.container.PortletResourceResponseContext;
 
 public class ResourceResponseImpl extends MimeResponseImpl implements ResourceResponse
 {

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/StateAwareResponseImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/StateAwareResponseImpl.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/StateAwareResponseImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/StateAwareResponseImpl.java Tue Mar 10 10:49:10 2009
@@ -29,9 +29,9 @@
 import javax.portlet.WindowStateException;
 import javax.xml.namespace.QName;
 
+import org.apache.pluto.container.PortalCallbackService;
+import org.apache.pluto.container.PortletStateAwareResponseContext;
 import org.apache.pluto.container.PortletWindow;
-import org.apache.pluto.container.spi.PortalCallbackService;
-import org.apache.pluto.container.spi.optional.PortletStateAwareResponseContext;
 import org.apache.pluto.util.ArgumentUtility;
 
 /**

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletActionResponseContextImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletActionResponseContextImpl.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletActionResponseContextImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletActionResponseContextImpl.java Tue Mar 10 10:49:10 2009
@@ -20,9 +20,9 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.pluto.container.PortletActionResponseContext;
 import org.apache.pluto.container.PortletContainer;
 import org.apache.pluto.container.PortletWindow;
-import org.apache.pluto.container.spi.optional.PortletActionResponseContext;
 
 /**
  * @version $Id$

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletEventResponseContextImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletEventResponseContextImpl.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletEventResponseContextImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletEventResponseContextImpl.java Tue Mar 10 10:49:10 2009
@@ -21,8 +21,8 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.pluto.container.PortletContainer;
+import org.apache.pluto.container.PortletEventResponseContext;
 import org.apache.pluto.container.PortletWindow;
-import org.apache.pluto.container.spi.optional.PortletEventResponseContext;
 
 /**
  * @version $Id$

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletMimeResponseContextImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletMimeResponseContextImpl.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletMimeResponseContextImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletMimeResponseContextImpl.java Tue Mar 10 10:49:10 2009
@@ -26,8 +26,8 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.pluto.container.PortletContainer;
+import org.apache.pluto.container.PortletMimeResponseContext;
 import org.apache.pluto.container.PortletWindow;
-import org.apache.pluto.container.spi.optional.PortletMimeResponseContext;
 
 /**
  * @version $Id$

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletRenderResponseContextImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletRenderResponseContextImpl.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletRenderResponseContextImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletRenderResponseContextImpl.java Tue Mar 10 10:49:10 2009
@@ -24,8 +24,8 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.pluto.container.PortletContainer;
+import org.apache.pluto.container.PortletRenderResponseContext;
 import org.apache.pluto.container.PortletWindow;
-import org.apache.pluto.container.spi.optional.PortletRenderResponseContext;
 
 /**
  * @version $Id$

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletRequestContextImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletRequestContextImpl.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletRequestContextImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletRequestContextImpl.java Tue Mar 10 10:49:10 2009
@@ -25,10 +25,10 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.pluto.container.InternalPortletConfig;
+import org.apache.pluto.container.ContainerPortletConfig;
 import org.apache.pluto.container.PortletContainer;
+import org.apache.pluto.container.PortletRequestContext;
 import org.apache.pluto.container.PortletWindow;
-import org.apache.pluto.container.spi.optional.PortletRequestContext;
 
 /**
  * @version $Id$
@@ -88,7 +88,7 @@
     /* (non-Javadoc)
      * @see org.apache.pluto.spi.optional.PortletRequestContext#getPortletConfig()
      */
-    public InternalPortletConfig getPortletConfig()
+    public ContainerPortletConfig getPortletConfig()
     {
         // TODO Auto-generated method stub
         return null;
@@ -157,7 +157,7 @@
     /* (non-Javadoc)
      * @see org.apache.pluto.spi.optional.PortletRequestContext#init(org.apache.pluto.internal.InternalPortletConfig)
      */
-    public void init(InternalPortletConfig portletConfig)
+    public void init(ContainerPortletConfig portletConfig)
     {
         // TODO Auto-generated method stub
     }

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletResourceRequestContextImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletResourceRequestContextImpl.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletResourceRequestContextImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletResourceRequestContextImpl.java Tue Mar 10 10:49:10 2009
@@ -23,8 +23,8 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.pluto.container.PortletContainer;
+import org.apache.pluto.container.PortletResourceRequestContext;
 import org.apache.pluto.container.PortletWindow;
-import org.apache.pluto.container.spi.optional.PortletResourceRequestContext;
 
 /**
  * @version $Id$

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletResourceResponseContextImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletResourceResponseContextImpl.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletResourceResponseContextImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletResourceResponseContextImpl.java Tue Mar 10 10:49:10 2009
@@ -23,8 +23,8 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.pluto.container.PortletContainer;
+import org.apache.pluto.container.PortletResourceResponseContext;
 import org.apache.pluto.container.PortletWindow;
-import org.apache.pluto.container.spi.optional.PortletResourceResponseContext;
 
 /**
  * @version $Id$

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletResponseContextImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletResponseContextImpl.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletResponseContextImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletResponseContextImpl.java Tue Mar 10 10:49:10 2009
@@ -22,8 +22,8 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.pluto.container.PortletContainer;
+import org.apache.pluto.container.PortletResponseContext;
 import org.apache.pluto.container.PortletWindow;
-import org.apache.pluto.container.spi.optional.PortletResponseContext;
 import org.w3c.dom.Element;
 
 /**

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletStateAwareResponseContextImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletStateAwareResponseContextImpl.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletStateAwareResponseContextImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/impl/PortletStateAwareResponseContextImpl.java Tue Mar 10 10:49:10 2009
@@ -28,8 +28,8 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.pluto.container.PortletContainer;
+import org.apache.pluto.container.PortletStateAwareResponseContext;
 import org.apache.pluto.container.PortletWindow;
-import org.apache.pluto.container.spi.optional.PortletStateAwareResponseContext;
 
 /**
  * @version $Id$

Modified: portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/PortletRequestImplTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/PortletRequestImplTest.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/PortletRequestImplTest.java (original)
+++ portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/PortletRequestImplTest.java Tue Mar 10 10:49:10 2009
@@ -21,15 +21,15 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
-import org.apache.pluto.container.InternalPortletContext;
+import org.apache.pluto.container.CCPPProfileService;
+import org.apache.pluto.container.ContainerPortletContext;
 import org.apache.pluto.container.OptionalContainerServices;
+import org.apache.pluto.container.PortalCallbackService;
 import org.apache.pluto.container.PortletContainer;
+import org.apache.pluto.container.PortletEnvironmentService;
+import org.apache.pluto.container.PortletURLProvider;
 import org.apache.pluto.container.PortletWindow;
 import org.apache.pluto.container.RequiredContainerServices;
-import org.apache.pluto.container.spi.CCPPProfileService;
-import org.apache.pluto.container.spi.PortalCallbackService;
-import org.apache.pluto.container.spi.PortletURLProvider;
-import org.apache.pluto.container.spi.optional.PortletEnvironmentService;
 import org.apache.pluto.core.PortletContainerImpl;
 import org.jmock.Mock;
 import org.jmock.cglib.MockObjectTestCase;
@@ -67,7 +67,7 @@
         mockCCPPProfileService = mock( CCPPProfileService.class );
         mockOptionalServices = mock( OptionalContainerServices.class );
         mockPortalContext = mock( PortalContext.class );
-        mockPortletContext = mock( InternalPortletContext.class );
+        mockPortletContext = mock( ContainerPortletContext.class );
         mockPortletURLProvider = mock(PortletURLProvider.class);
         mockContainer = mock( PortletContainerImpl.class,
                 new Class[] { String.class, RequiredContainerServices.class, OptionalContainerServices.class },
@@ -110,7 +110,7 @@
         
         // Create the render request that is under test, and initialize its state
         RenderRequestImpl request = new RenderRequestImpl( (PortletContainer)mockContainer.proxy(), window, (HttpServletRequest)mockHttpServletRequest.proxy() );
-        request.init( (InternalPortletContext)mockPortletContext.proxy(), ( HttpServletRequest)mockHttpServletRequest.proxy() );
+        request.init( (ContainerPortletContext)mockPortletContext.proxy(), ( HttpServletRequest)mockHttpServletRequest.proxy() );
 
         // Mock the HttpSession, and set its expectations: it will return 0 for the last accessed time, and 5
         // for the maximum inactive interval

Modified: portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/PlutoTestCase.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/PlutoTestCase.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/PlutoTestCase.java (original)
+++ portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/PlutoTestCase.java Tue Mar 10 10:49:10 2009
@@ -19,8 +19,8 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
+import org.apache.pluto.container.ContainerServices;
 import org.apache.pluto.container.driver.PlutoServices;
-import org.apache.pluto.container.services.ContainerServices;
 import org.apache.pluto.core.PlutoContainerServices;
 import org.jmock.MockObjectTestCase;
 

Modified: portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/config/impl/DriverConfigurationImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/config/impl/DriverConfigurationImpl.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/config/impl/DriverConfigurationImpl.java (original)
+++ portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/config/impl/DriverConfigurationImpl.java Tue Mar 10 10:49:10 2009
@@ -23,10 +23,10 @@
 import javax.portlet.PortletMode;
 import javax.servlet.ServletContext;
 
+import org.apache.pluto.container.PortalCallbackService;
 import org.apache.pluto.container.PortletContainerException;
-import org.apache.pluto.container.spi.PortalCallbackService;
-import org.apache.pluto.container.spi.optional.PortletPreferencesService;
-import org.apache.pluto.container.spi.optional.PortletRegistryService;
+import org.apache.pluto.container.PortletPreferencesService;
+import org.apache.pluto.container.driver.PortletRegistryService;
 import org.apache.pluto.driver.config.DriverConfiguration;
 import org.apache.pluto.driver.services.portal.PageConfig;
 import org.apache.pluto.driver.services.portal.PropertyConfigService;

Modified: portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.java?rev=752055&r1=752054&r2=752055&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.java (original)
+++ portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.java Tue Mar 10 10:49:10 2009
@@ -18,12 +18,12 @@
 
 import javax.portlet.PortalContext;
 
+import org.apache.pluto.container.CCPPProfileService;
+import org.apache.pluto.container.ContainerInvocationService;
 import org.apache.pluto.container.OptionalContainerServices;
+import org.apache.pluto.container.PortalCallbackService;
+import org.apache.pluto.container.PortletPreferencesService;
 import org.apache.pluto.container.RequiredContainerServices;
-import org.apache.pluto.container.spi.CCPPProfileService;
-import org.apache.pluto.container.spi.ContainerInvocationService;
-import org.apache.pluto.container.spi.PortalCallbackService;
-import org.apache.pluto.container.spi.optional.PortletPreferencesService;
 import org.apache.pluto.core.PlutoContainerServices;
 import org.apache.pluto.driver.config.DriverConfiguration;