You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by dd...@apache.org on 2005/11/02 04:51:10 UTC
svn commit: r330180 - in /portals/pluto/trunk:
pluto-container/src/main/java/org/apache/pluto/
pluto-container/src/main/java/org/apache/pluto/core/
pluto-container/src/main/java/org/apache/pluto/core/impl/
pluto-container/src/main/java/org/apache/pluto...
Author: ddewolf
Date: Tue Nov 1 19:51:03 2005
New Revision: 330180
URL: http://svn.apache.org/viewcvs?rev=330180&view=rev
Log:
Refactoring to ensure that all embedding/integration points exist within the root package; removing old services never discarded
Added:
portals/pluto/trunk/pluto-site/src/site/images/
portals/pluto/trunk/pluto-site/src/site/images/1.0.1/
Removed:
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/services/PortalCallbackProvider.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/services/PortletContainerServices.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/services/PortletPreferencesFactory.java
Modified:
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/PortletContainer.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/PortletContainerFactory.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultOptionalServices.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/PortletInvoker.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/impl/PortletResponseImpl.java
portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.java
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/PortletContainer.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/PortletContainer.java?rev=330180&r1=330179&r2=330180&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/PortletContainer.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/PortletContainer.java Tue Nov 1 19:51:03 2005
@@ -15,9 +15,6 @@
*/
package org.apache.pluto;
-import org.apache.pluto.services.PortletContainerServices;
-import org.apache.pluto.services.OptionalPortletContainerServices;
-
import javax.portlet.PortletException;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/PortletContainerFactory.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/PortletContainerFactory.java?rev=330180&r1=330179&r2=330180&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/PortletContainerFactory.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/PortletContainerFactory.java Tue Nov 1 19:51:03 2005
@@ -19,8 +19,6 @@
import org.apache.commons.logging.LogFactory;
import org.apache.pluto.core.PortletContainerImpl;
import org.apache.pluto.core.DefaultOptionalServices;
-import org.apache.pluto.services.PortletContainerServices;
-import org.apache.pluto.services.OptionalPortletContainerServices;
import org.apache.pluto.util.ArgumentUtility;
/**
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultOptionalServices.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultOptionalServices.java?rev=330180&r1=330179&r2=330180&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultOptionalServices.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultOptionalServices.java Tue Nov 1 19:51:03 2005
@@ -15,27 +15,13 @@
*/
package org.apache.pluto.core;
-import java.io.IOException;
-import java.util.Map;
-
-import javax.portlet.PortletException;
import javax.portlet.PortletRequest;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.pluto.PortletContainer;
import org.apache.pluto.PortletContainerException;
import org.apache.pluto.PortletWindow;
-import org.apache.pluto.core.impl.ActionRequestImpl;
-import org.apache.pluto.core.impl.ActionResponseImpl;
-import org.apache.pluto.core.impl.RenderRequestImpl;
-import org.apache.pluto.core.impl.RenderResponseImpl;
-import org.apache.pluto.services.PortletContainerServices;
-import org.apache.pluto.services.PortletURLProvider;
-import org.apache.pluto.services.OptionalPortletContainerServices;
+import org.apache.pluto.OptionalPortletContainerServices;
import org.apache.pluto.services.PortletPreferencesService;
/**
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletContainerImpl.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletContainerImpl.java?rev=330180&r1=330179&r2=330180&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 Nov 1 19:51:03 2005
@@ -25,16 +25,13 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.pluto.PortletContainer;
-import org.apache.pluto.PortletContainerException;
-import org.apache.pluto.PortletWindow;
+import org.apache.pluto.*;
import org.apache.pluto.core.impl.ActionRequestImpl;
import org.apache.pluto.core.impl.ActionResponseImpl;
import org.apache.pluto.core.impl.RenderRequestImpl;
import org.apache.pluto.core.impl.RenderResponseImpl;
-import org.apache.pluto.services.PortletContainerServices;
import org.apache.pluto.services.PortletURLProvider;
-import org.apache.pluto.services.OptionalPortletContainerServices;
+import org.apache.pluto.OptionalPortletContainerServices;
/**
* Default Pluto Container implementation.
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletInvoker.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletInvoker.java?rev=330180&r1=330179&r2=330180&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletInvoker.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletInvoker.java Tue Nov 1 19:51:03 2005
@@ -20,8 +20,6 @@
import javax.portlet.PortletException;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/impl/PortletResponseImpl.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/impl/PortletResponseImpl.java?rev=330180&r1=330179&r2=330180&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/impl/PortletResponseImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/impl/PortletResponseImpl.java Tue Nov 1 19:51:03 2005
@@ -29,9 +29,9 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.pluto.PortletContainer;
+import org.apache.pluto.PortletContainerServices;
import org.apache.pluto.core.InternalPortletResponse;
import org.apache.pluto.core.InternalPortletWindow;
-import org.apache.pluto.services.PortletContainerServices;
import org.apache.pluto.services.ResourceURLProvider;
import org.apache.pluto.util.PrintWriterServletOutputStream;
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.java?rev=330180&r1=330179&r2=330180&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.java Tue Nov 1 19:51:03 2005
@@ -15,7 +15,10 @@
*/
package org.apache.pluto.driver.services.container;
-import org.apache.pluto.services.*;
+import org.apache.pluto.OptionalPortletContainerServices;
+import org.apache.pluto.services.PortalCallbackService;
+import org.apache.pluto.PortletContainerServices;
+import org.apache.pluto.services.PortletPreferencesService;
import javax.portlet.PortalContext;