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 at...@apache.org on 2009/03/10 10:24:49 UTC
svn commit: r752027 [2/4] - in /portals/pluto/trunk:
pluto-container-api/src/main/java/org/apache/pluto/
pluto-container-api/src/main/java/org/apache/pluto/container/
pluto-container-api/src/main/java/org/apache/pluto/container/driver/
pluto-container-...
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/services/PortletAppDescriptorService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/services/PortletAppDescriptorService.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/services/PortletAppDescriptorService.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/services/PortletAppDescriptorService.java Tue Mar 10 09:24:41 2009
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package org.apache.pluto.services;
+package org.apache.pluto.container.services;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import org.apache.pluto.om.portlet.PortletApplicationDefinition;
+import org.apache.pluto.container.om.portlet.PortletApplicationDefinition;
/**
* Read/Write services for Portlet Application configuration
Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/CCPPProfileService.java (from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/CCPPProfileService.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/CCPPProfileService.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/CCPPProfileService.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/CCPPProfileService.java&r1=751937&r2=752027&rev=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/CCPPProfileService.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/CCPPProfileService.java Tue Mar 10 09:24:41 2009
@@ -1,7 +1,7 @@
/**
*
*/
-package org.apache.pluto.spi;
+package org.apache.pluto.container.spi;
import javax.ccpp.Profile;
import javax.servlet.http.HttpServletRequest;
Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/CCPPProfileService.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/ContainerInvocationService.java (from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/ContainerInvocationService.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/ContainerInvocationService.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/ContainerInvocationService.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/ContainerInvocationService.java&r1=751937&r2=752027&rev=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/ContainerInvocationService.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/ContainerInvocationService.java Tue Mar 10 09:24:41 2009
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.spi;
+package org.apache.pluto.container.spi;
-import org.apache.pluto.PortletContainer;
-import org.apache.pluto.PortletWindow;
-import org.apache.pluto.ContainerInvocation;
+import org.apache.pluto.container.ContainerInvocation;
+import org.apache.pluto.container.PortletContainer;
+import org.apache.pluto.container.PortletWindow;
public interface ContainerInvocationService
Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/ContainerInvocationService.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/EventCoordinationService.java (from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/EventCoordinationService.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/EventCoordinationService.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/EventCoordinationService.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/EventCoordinationService.java&r1=751937&r2=752027&rev=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/EventCoordinationService.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/EventCoordinationService.java Tue Mar 10 09:24:41 2009
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.pluto.spi;
+package org.apache.pluto.container.spi;
import java.util.List;
import javax.portlet.Event;
-import org.apache.pluto.PortletWindow;
+import org.apache.pluto.container.PortletWindow;
/**
* @author <a href="mailto:ate@douma.nu">Ate Douma</a>
Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/EventCoordinationService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/EventCoordinationService.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/EventCoordinationService.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/EventProvider.java (from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/EventProvider.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/EventProvider.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/EventProvider.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/EventProvider.java&r1=751937&r2=752027&rev=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/EventProvider.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/EventProvider.java Tue Mar 10 09:24:41 2009
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.spi;
+package org.apache.pluto.container.spi;
import java.io.Serializable;
Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/EventProvider.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/FilterManager.java (from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/FilterManager.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/FilterManager.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/FilterManager.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/FilterManager.java&r1=751937&r2=752027&rev=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/FilterManager.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/FilterManager.java Tue Mar 10 09:24:41 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.spi;
+package org.apache.pluto.container.spi;
import java.io.IOException;
Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/FilterManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/PortalCallbackService.java (from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/PortalCallbackService.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/PortalCallbackService.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/PortalCallbackService.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/PortalCallbackService.java&r1=751937&r2=752027&rev=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/PortalCallbackService.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/PortalCallbackService.java Tue Mar 10 09:24:41 2009
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.spi;
+package org.apache.pluto.container.spi;
import javax.servlet.http.HttpServletRequest;
-import org.apache.pluto.PortletWindow;
-import org.apache.pluto.om.portlet.PortletApplicationDefinition;
+import org.apache.pluto.container.PortletWindow;
+import org.apache.pluto.container.om.portlet.PortletApplicationDefinition;
/**
* The callback service interface defining callback methods that will be invoked
Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/PortalCallbackService.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/PortletURLListener.java (from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/PortletURLListener.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/PortletURLListener.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/PortletURLListener.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/PortletURLListener.java&r1=751937&r2=752027&rev=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/PortletURLListener.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/PortletURLListener.java Tue Mar 10 09:24:41 2009
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.spi;
+package org.apache.pluto.container.spi;
import javax.portlet.BaseURL;
-import org.apache.pluto.om.portlet.PortletApplicationDefinition;
+import org.apache.pluto.container.om.portlet.PortletApplicationDefinition;
public interface PortletURLListener {
public void callListener(PortletApplicationDefinition portletAppDD, BaseURL baseURL, boolean isAction, boolean isResource);
Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/PortletURLListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/PortletURLProvider.java (from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/PortletURLProvider.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/PortletURLProvider.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/PortletURLProvider.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/PortletURLProvider.java&r1=751937&r2=752027&rev=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/PortletURLProvider.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/PortletURLProvider.java Tue Mar 10 09:24:41 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.spi;
+package org.apache.pluto.container.spi;
import java.io.Writer;
import java.util.List;
Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/PortletURLProvider.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/ResourceURLProvider.java (from r751937, portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/ResourceURLProvider.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/ResourceURLProvider.java?p2=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/ResourceURLProvider.java&p1=portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/ResourceURLProvider.java&r1=751937&r2=752027&rev=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/ResourceURLProvider.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/ResourceURLProvider.java Tue Mar 10 09:24:41 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.spi;
+package org.apache.pluto.container.spi;
/**
*
Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/ResourceURLProvider.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/AdministrativeRequestListener.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/AdministrativeRequestListener.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/AdministrativeRequestListener.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/AdministrativeRequestListener.java Tue Mar 10 09:24:41 2009
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.spi.optional;
+package org.apache.pluto.container.spi.optional;
import javax.portlet.PortletRequest;
import javax.portlet.PortletResponse;
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/P3PAttributes.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/P3PAttributes.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/P3PAttributes.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/P3PAttributes.java Tue Mar 10 09:24:41 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.spi.optional;
+package org.apache.pluto.container.spi.optional;
/**
* As defined in PLT.D of the JSR-168 specification, this class defines a set of
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortalAdministrationService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortalAdministrationService.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortalAdministrationService.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortalAdministrationService.java Tue Mar 10 09:24:41 2009
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.spi.optional;
+package org.apache.pluto.container.spi.optional;
import java.util.List;
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletActionResponseContext.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletActionResponseContext.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletActionResponseContext.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletActionResponseContext.java Tue Mar 10 09:24:41 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.pluto.spi.optional;
+package org.apache.pluto.container.spi.optional;
/**
* @author <a href="mailto:ate@douma.nu">Ate Douma</a>
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletContextService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletContextService.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletContextService.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletContextService.java Tue Mar 10 09:24:41 2009
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.pluto.spi.optional;
+package org.apache.pluto.container.spi.optional;
import java.util.Iterator;
import javax.servlet.ServletConfig;
-import org.apache.pluto.PortletContainerException;
-import org.apache.pluto.PortletWindow;
-import org.apache.pluto.internal.InternalPortletConfig;
-import org.apache.pluto.internal.InternalPortletContext;
+import org.apache.pluto.container.InternalPortletConfig;
+import org.apache.pluto.container.InternalPortletContext;
+import org.apache.pluto.container.PortletContainerException;
+import org.apache.pluto.container.PortletWindow;
/**
* Interface defining the services used by both the Pluto Portal Driver
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletEnvironmentService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletEnvironmentService.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletEnvironmentService.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletEnvironmentService.java Tue Mar 10 09:24:41 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.spi.optional;
+package org.apache.pluto.container.spi.optional;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -30,7 +30,7 @@
import javax.portlet.ResourceResponse;
import javax.servlet.http.HttpSession;
-import org.apache.pluto.PortletWindow;
+import org.apache.pluto.container.PortletWindow;
/**
* Factory Service for creating Portlet request, responses and session.
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletEventResponseContext.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletEventResponseContext.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletEventResponseContext.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletEventResponseContext.java Tue Mar 10 09:24:41 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.pluto.spi.optional;
+package org.apache.pluto.container.spi.optional;
/**
* @author <a href="mailto:ate@douma.nu">Ate Douma</a>
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletInfoService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletInfoService.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletInfoService.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletInfoService.java Tue Mar 10 09:24:41 2009
@@ -15,9 +15,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.spi.optional;
+package org.apache.pluto.container.spi.optional;
-import org.apache.pluto.PortletWindow;
+import org.apache.pluto.container.PortletWindow;
/**
* Callback service which makes it possible to customize
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletInvocationEvent.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletInvocationEvent.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletInvocationEvent.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletInvocationEvent.java Tue Mar 10 09:24:41 2009
@@ -15,12 +15,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.spi.optional;
+package org.apache.pluto.container.spi.optional;
import javax.portlet.PortletRequest;
-import org.apache.pluto.Constants;
-import org.apache.pluto.PortletWindow;
+import org.apache.pluto.container.Constants;
+import org.apache.pluto.container.PortletWindow;
public class PortletInvocationEvent {
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletInvocationListener.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletInvocationListener.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletInvocationListener.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletInvocationListener.java Tue Mar 10 09:24:41 2009
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.spi.optional;
+package org.apache.pluto.container.spi.optional;
public interface PortletInvocationListener {
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletInvokerService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletInvokerService.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletInvokerService.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletInvokerService.java Tue Mar 10 09:24:41 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.spi.optional;
+package org.apache.pluto.container.spi.optional;
import java.io.IOException;
@@ -30,8 +30,8 @@
import javax.portlet.ResourceRequest;
import javax.portlet.ResourceResponse;
-import org.apache.pluto.PortletContainerException;
-import org.apache.pluto.spi.FilterManager;
+import org.apache.pluto.container.PortletContainerException;
+import org.apache.pluto.container.spi.FilterManager;
/**
* Service used to invoke portlets.
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletMimeResponseContext.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletMimeResponseContext.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletMimeResponseContext.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletMimeResponseContext.java Tue Mar 10 09:24:41 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.pluto.spi.optional;
+package org.apache.pluto.container.spi.optional;
import java.io.OutputStream;
import java.io.PrintWriter;
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletPreferencesService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletPreferencesService.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletPreferencesService.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletPreferencesService.java Tue Mar 10 09:24:41 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.spi.optional;
+package org.apache.pluto.container.spi.optional;
import java.util.Map;
@@ -22,10 +22,10 @@
import javax.portlet.PreferencesValidator;
import javax.portlet.ValidatorException;
-import org.apache.pluto.PortletContainerException;
-import org.apache.pluto.PortletWindow;
-import org.apache.pluto.internal.InternalPortletPreference;
-import org.apache.pluto.om.portlet.PortletDefinition;
+import org.apache.pluto.container.InternalPortletPreference;
+import org.apache.pluto.container.PortletContainerException;
+import org.apache.pluto.container.PortletWindow;
+import org.apache.pluto.container.om.portlet.PortletDefinition;
/**
* Portlet preferences service that should be implemented by the portal.
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRegistryEvent.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRegistryEvent.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRegistryEvent.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRegistryEvent.java Tue Mar 10 09:24:41 2009
@@ -15,9 +15,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.spi.optional;
+package org.apache.pluto.container.spi.optional;
-import org.apache.pluto.om.portlet.PortletApplicationDefinition;
+import org.apache.pluto.container.om.portlet.PortletApplicationDefinition;
/**
* Encapsulation of event information.
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRegistryListener.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRegistryListener.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRegistryListener.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRegistryListener.java Tue Mar 10 09:24:41 2009
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.spi.optional;
+package org.apache.pluto.container.spi.optional;
/**
* Listener interface implemented by observers of
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRegistryService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRegistryService.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRegistryService.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRegistryService.java Tue Mar 10 09:24:41 2009
@@ -15,13 +15,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.spi.optional;
+package org.apache.pluto.container.spi.optional;
import java.util.Iterator;
-import org.apache.pluto.PortletContainerException;
-import org.apache.pluto.om.portlet.PortletDefinition;
-import org.apache.pluto.om.portlet.PortletApplicationDefinition;
+import org.apache.pluto.container.PortletContainerException;
+import org.apache.pluto.container.om.portlet.PortletApplicationDefinition;
+import org.apache.pluto.container.om.portlet.PortletDefinition;
/**
* Interface defining the services used by the container
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRenderResponseContext.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRenderResponseContext.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRenderResponseContext.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRenderResponseContext.java Tue Mar 10 09:24:41 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.pluto.spi.optional;
+package org.apache.pluto.container.spi.optional;
import java.util.Collection;
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRequestContext.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRequestContext.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRequestContext.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRequestContext.java Tue Mar 10 09:24:41 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.pluto.spi.optional;
+package org.apache.pluto.container.spi.optional;
import java.util.Enumeration;
import java.util.Locale;
@@ -25,9 +25,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.pluto.PortletContainer;
-import org.apache.pluto.PortletWindow;
-import org.apache.pluto.internal.InternalPortletConfig;
+import org.apache.pluto.container.InternalPortletConfig;
+import org.apache.pluto.container.PortletContainer;
+import org.apache.pluto.container.PortletWindow;
/**
* @author <a href="mailto:ate@douma.nu">Ate Douma</a>
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRequestContextService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRequestContextService.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRequestContextService.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletRequestContextService.java Tue Mar 10 09:24:41 2009
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.spi.optional;
+package org.apache.pluto.container.spi.optional;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.pluto.PortletContainer;
-import org.apache.pluto.PortletWindow;
+import org.apache.pluto.container.PortletContainer;
+import org.apache.pluto.container.PortletWindow;
/**
* @author <a href="mailto:ate@douma.nu">Ate Douma</a>
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletResourceRequestContext.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletResourceRequestContext.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletResourceRequestContext.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletResourceRequestContext.java Tue Mar 10 09:24:41 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.pluto.spi.optional;
+package org.apache.pluto.container.spi.optional;
import java.util.Map;
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletResourceResponseContext.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletResourceResponseContext.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletResourceResponseContext.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletResourceResponseContext.java Tue Mar 10 09:24:41 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.pluto.spi.optional;
+package org.apache.pluto.container.spi.optional;
import java.util.Locale;
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletResponseContext.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletResponseContext.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletResponseContext.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletResponseContext.java Tue Mar 10 09:24:41 2009
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.pluto.spi.optional;
+package org.apache.pluto.container.spi.optional;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.pluto.PortletContainer;
-import org.apache.pluto.PortletWindow;
+import org.apache.pluto.container.PortletContainer;
+import org.apache.pluto.container.PortletWindow;
import org.w3c.dom.Element;
/**
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletStateAwareResponseContext.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletStateAwareResponseContext.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletStateAwareResponseContext.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/PortletStateAwareResponseContext.java Tue Mar 10 09:24:41 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.pluto.spi.optional;
+package org.apache.pluto.container.spi.optional;
import java.util.List;
import java.util.Map;
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/UserInfoService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/UserInfoService.java?rev=752027&r1=751937&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/UserInfoService.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/spi/optional/UserInfoService.java Tue Mar 10 09:24:41 2009
@@ -15,14 +15,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.spi.optional;
+package org.apache.pluto.container.spi.optional;
import java.util.Map;
import javax.portlet.PortletRequest;
-import org.apache.pluto.PortletContainerException;
-import org.apache.pluto.PortletWindow;
+import org.apache.pluto.container.PortletContainerException;
+import org.apache.pluto.container.PortletWindow;
/**
* Used to access user information attributes as described in
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/PortletContainerFactory.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/PortletContainerFactory.java?rev=752027&r1=752026&r2=752027&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 Mar 10 09:24:41 2009
@@ -18,6 +18,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.pluto.container.OptionalContainerServices;
+import org.apache.pluto.container.PortletContainer;
+import org.apache.pluto.container.PortletContainerException;
+import org.apache.pluto.container.RequiredContainerServices;
import org.apache.pluto.core.DefaultOptionalContainerServices;
import org.apache.pluto.core.PortletContainerImpl;
import org.apache.pluto.util.ArgumentUtility;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/ContainerInvocationImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/ContainerInvocationImpl.java?rev=752027&r1=752026&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/ContainerInvocationImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/ContainerInvocationImpl.java Tue Mar 10 09:24:41 2009
@@ -17,9 +17,9 @@
*/
package org.apache.pluto.core;
-import org.apache.pluto.ContainerInvocation;
-import org.apache.pluto.PortletContainer;
-import org.apache.pluto.PortletWindow;
+import org.apache.pluto.container.ContainerInvocation;
+import org.apache.pluto.container.PortletContainer;
+import org.apache.pluto.container.PortletWindow;
/**
* <font style="color: red">Whenever possible,
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=752027&r1=752026&r2=752027&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 09:24:41 2009
@@ -1,9 +1,9 @@
package org.apache.pluto.core;
-import org.apache.pluto.ContainerInvocation;
-import org.apache.pluto.PortletContainer;
-import org.apache.pluto.PortletWindow;
-import org.apache.pluto.spi.ContainerInvocationService;
+import org.apache.pluto.container.ContainerInvocation;
+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/DefaultNamespaceMapper.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultNamespaceMapper.java?rev=752027&r1=752026&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultNamespaceMapper.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultNamespaceMapper.java Tue Mar 10 09:24:41 2009
@@ -16,8 +16,8 @@
*/
package org.apache.pluto.core;
-import org.apache.pluto.NamespaceMapper;
-import org.apache.pluto.PortletWindowID;
+import org.apache.pluto.container.NamespaceMapper;
+import org.apache.pluto.container.PortletWindowID;
/**
* Default implementation of <code>NamespaceMapper</code> interface.
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=752027&r1=752026&r2=752027&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 09:24:41 2009
@@ -16,19 +16,19 @@
*/
package org.apache.pluto.core;
-import org.apache.pluto.NamespaceMapper;
-import org.apache.pluto.OptionalContainerServices;
+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.descriptors.services.jaxb.PortletAppDescriptorServiceImpl;
-import org.apache.pluto.services.PortletAppDescriptorService;
-import org.apache.pluto.spi.optional.PortalAdministrationService;
-import org.apache.pluto.spi.optional.PortletContextService;
-import org.apache.pluto.spi.optional.PortletEnvironmentService;
-import org.apache.pluto.spi.optional.PortletInfoService;
-import org.apache.pluto.spi.optional.PortletInvokerService;
-import org.apache.pluto.spi.optional.PortletPreferencesService;
-import org.apache.pluto.spi.optional.PortletRegistryService;
-import org.apache.pluto.spi.optional.PortletRequestContextService;
-import org.apache.pluto.spi.optional.UserInfoService;
/**
* Default Optional Container Services implementation.
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=752027&r1=752026&r2=752027&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 09:24:41 2009
@@ -20,9 +20,9 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.pluto.spi.optional.AdministrativeRequestListener;
-import org.apache.pluto.spi.optional.PortalAdministrationService;
-import org.apache.pluto.spi.optional.PortletInvocationListener;
+import org.apache.pluto.container.spi.optional.AdministrativeRequestListener;
+import org.apache.pluto.container.spi.optional.PortalAdministrationService;
+import org.apache.pluto.container.spi.optional.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=752027&r1=752026&r2=752027&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 09:24:41 2009
@@ -31,7 +31,14 @@
import javax.portlet.ResourceResponse;
import javax.servlet.http.HttpSession;
-import org.apache.pluto.PortletWindow;
+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;
@@ -41,13 +48,6 @@
import org.apache.pluto.internal.impl.RenderResponseImpl;
import org.apache.pluto.internal.impl.ResourceRequestImpl;
import org.apache.pluto.internal.impl.ResourceResponseImpl;
-import org.apache.pluto.spi.optional.PortletActionResponseContext;
-import org.apache.pluto.spi.optional.PortletEnvironmentService;
-import org.apache.pluto.spi.optional.PortletEventResponseContext;
-import org.apache.pluto.spi.optional.PortletRenderResponseContext;
-import org.apache.pluto.spi.optional.PortletRequestContext;
-import org.apache.pluto.spi.optional.PortletResourceRequestContext;
-import org.apache.pluto.spi.optional.PortletResourceResponseContext;
public class DefaultPortletEnvironmentService implements PortletEnvironmentService
{
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=752027&r1=752026&r2=752027&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 09:24:41 2009
@@ -17,9 +17,9 @@
*/
package org.apache.pluto.core;
-import org.apache.pluto.PortletWindow;
-import org.apache.pluto.om.portlet.PortletInfo;
-import org.apache.pluto.spi.optional.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=752027&r1=752026&r2=752027&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 09:24:41 2009
@@ -37,14 +37,14 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.pluto.Constants;
-import org.apache.pluto.PortletContainerException;
-import org.apache.pluto.PortletWindow;
-import org.apache.pluto.driver.PortletServlet;
-import org.apache.pluto.spi.FilterManager;
-import org.apache.pluto.spi.optional.PortletContextService;
-import org.apache.pluto.spi.optional.PortletInvokerService;
-import org.apache.pluto.spi.optional.PortletRequestContext;
+import org.apache.pluto.container.Constants;
+import org.apache.pluto.container.PortletContainerException;
+import org.apache.pluto.container.PortletWindow;
+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=752027&r1=752026&r2=752027&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 09:24:41 2009
@@ -26,14 +26,14 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.pluto.PortletContainerException;
-import org.apache.pluto.PortletWindow;
-import org.apache.pluto.internal.InternalPortletPreference;
+import org.apache.pluto.container.InternalPortletPreference;
+import org.apache.pluto.container.PortletContainerException;
+import org.apache.pluto.container.PortletWindow;
+import org.apache.pluto.container.om.portlet.PortletDefinition;
+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;
-import org.apache.pluto.om.portlet.PortletDefinition;
-import org.apache.pluto.om.portlet.Preference;
-import org.apache.pluto.om.portlet.Preferences;
-import org.apache.pluto.spi.optional.PortletPreferencesService;
/**
* Default implementation of the portlet preferences service. The portlet
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=752027&r1=752026&r2=752027&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 09:24:41 2009
@@ -20,21 +20,21 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.pluto.PortletContainer;
-import org.apache.pluto.PortletWindow;
+import org.apache.pluto.container.PortletContainer;
+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;
import org.apache.pluto.spi.impl.PortletRequestContextImpl;
import org.apache.pluto.spi.impl.PortletResourceRequestContextImpl;
import org.apache.pluto.spi.impl.PortletResourceResponseContextImpl;
-import org.apache.pluto.spi.optional.PortletActionResponseContext;
-import org.apache.pluto.spi.optional.PortletEventResponseContext;
-import org.apache.pluto.spi.optional.PortletRenderResponseContext;
-import org.apache.pluto.spi.optional.PortletRequestContext;
-import org.apache.pluto.spi.optional.PortletRequestContextService;
-import org.apache.pluto.spi.optional.PortletResourceRequestContext;
-import org.apache.pluto.spi.optional.PortletResourceResponseContext;
/**
* @author <a href="mailto:ate@douma.nu">Ate Douma</a>
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=752027&r1=752026&r2=752027&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 09:24:41 2009
@@ -22,9 +22,9 @@
import javax.portlet.PortletRequest;
-import org.apache.pluto.PortletContainerException;
-import org.apache.pluto.PortletWindow;
-import org.apache.pluto.spi.optional.UserInfoService;
+import org.apache.pluto.container.PortletContainerException;
+import org.apache.pluto.container.PortletWindow;
+import org.apache.pluto.container.spi.optional.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=752027&r1=752026&r2=752027&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 09:24:41 2009
@@ -6,8 +6,8 @@
import javax.ccpp.Profile;
import javax.servlet.http.HttpServletRequest;
+import org.apache.pluto.container.spi.CCPPProfileService;
import org.apache.pluto.internal.impl.DummyProfile;
-import org.apache.pluto.spi.CCPPProfileService;
/**
*
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=752027&r1=752026&r2=752027&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 09:24:41 2009
@@ -18,23 +18,23 @@
import javax.portlet.PortalContext;
-import org.apache.pluto.NamespaceMapper;
-import org.apache.pluto.OptionalContainerServices;
-import org.apache.pluto.RequiredContainerServices;
-import org.apache.pluto.services.ContainerServices;
-import org.apache.pluto.spi.CCPPProfileService;
-import org.apache.pluto.spi.ContainerInvocationService;
-import org.apache.pluto.spi.EventCoordinationService;
-import org.apache.pluto.spi.PortalCallbackService;
-import org.apache.pluto.spi.optional.PortalAdministrationService;
-import org.apache.pluto.spi.optional.PortletContextService;
-import org.apache.pluto.spi.optional.PortletEnvironmentService;
-import org.apache.pluto.spi.optional.PortletInfoService;
-import org.apache.pluto.spi.optional.PortletInvokerService;
-import org.apache.pluto.spi.optional.PortletPreferencesService;
-import org.apache.pluto.spi.optional.PortletRegistryService;
-import org.apache.pluto.spi.optional.PortletRequestContextService;
-import org.apache.pluto.spi.optional.UserInfoService;
+import org.apache.pluto.container.NamespaceMapper;
+import org.apache.pluto.container.OptionalContainerServices;
+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;
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=752027&r1=752026&r2=752027&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 09:24:41 2009
@@ -35,25 +35,25 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.pluto.Constants;
-import org.apache.pluto.EventContainer;
-import org.apache.pluto.OptionalContainerServices;
-import org.apache.pluto.PortletContainer;
-import org.apache.pluto.PortletContainerException;
-import org.apache.pluto.PortletEntity;
-import org.apache.pluto.PortletWindow;
-import org.apache.pluto.RequiredContainerServices;
-import org.apache.pluto.spi.ContainerInvocationService;
-import org.apache.pluto.spi.FilterManager;
-import org.apache.pluto.spi.optional.PortletActionResponseContext;
-import org.apache.pluto.spi.optional.PortletEnvironmentService;
-import org.apache.pluto.spi.optional.PortletEventResponseContext;
-import org.apache.pluto.spi.optional.PortletInvokerService;
-import org.apache.pluto.spi.optional.PortletRenderResponseContext;
-import org.apache.pluto.spi.optional.PortletRequestContext;
-import org.apache.pluto.spi.optional.PortletRequestContextService;
-import org.apache.pluto.spi.optional.PortletResourceRequestContext;
-import org.apache.pluto.spi.optional.PortletResourceResponseContext;
+import org.apache.pluto.container.Constants;
+import org.apache.pluto.container.EventContainer;
+import org.apache.pluto.container.OptionalContainerServices;
+import org.apache.pluto.container.PortletContainer;
+import org.apache.pluto.container.PortletContainerException;
+import org.apache.pluto.container.PortletEntity;
+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=752027&r1=752026&r2=752027&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 09:24:41 2009
@@ -30,19 +30,19 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.pluto.PortletContainerException;
-import org.apache.pluto.PortletWindow;
-import org.apache.pluto.internal.InternalPortletConfig;
-import org.apache.pluto.internal.InternalPortletContext;
+import org.apache.pluto.container.InternalPortletConfig;
+import org.apache.pluto.container.InternalPortletContext;
+import org.apache.pluto.container.PortletContainerException;
+import org.apache.pluto.container.PortletWindow;
+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;
-import org.apache.pluto.om.portlet.PortletApplicationDefinition;
-import org.apache.pluto.om.portlet.PortletDefinition;
-import org.apache.pluto.spi.optional.PortletContextService;
-import org.apache.pluto.spi.optional.PortletRegistryEvent;
-import org.apache.pluto.spi.optional.PortletRegistryListener;
-import org.apache.pluto.spi.optional.PortletRegistryService;
import org.apache.pluto.util.ClasspathScanner;
/**
@@ -148,7 +148,7 @@
}
/**
- * @see org.apache.pluto.spi.optional.PortletContextService#unregister(org.apache.pluto.internal.InternalPortletContext)
+ * @see org.apache.pluto.container.spi.optional.PortletContextService#unregister(org.apache.pluto.container.InternalPortletContext)
*/
public void unregister(InternalPortletContext context) {
portletContexts.remove(context.getApplicationName());
@@ -164,28 +164,28 @@
}
/**
- * @see org.apache.pluto.spi.optional.PortletRegistryService#getRegisteredPortletApplicationNames()
+ * @see org.apache.pluto.container.spi.optional.PortletRegistryService#getRegisteredPortletApplicationNames()
*/
public Iterator<String> getRegisteredPortletApplicationNames() {
return new HashSet<String>(portletContexts.keySet()).iterator();
}
/**
- * @see org.apache.pluto.spi.optional.PortletContextService#getPortletContexts()
+ * @see org.apache.pluto.container.spi.optional.PortletContextService#getPortletContexts()
*/
public Iterator<InternalPortletContext> getPortletContexts() {
return new HashSet<InternalPortletContext>(portletContexts.values()).iterator();
}
/**
- * @see org.apache.pluto.spi.optional.PortletContextService#getPortletContext(java.lang.String)
+ * @see org.apache.pluto.container.spi.optional.PortletContextService#getPortletContext(java.lang.String)
*/
public InternalPortletContext getPortletContext(String applicationName) {
return portletContexts.get(applicationName);
}
/**
- * @see org.apache.pluto.spi.optional.PortletContextService#getPortletContext(org.apache.pluto.PortletWindow)
+ * @see org.apache.pluto.container.spi.optional.PortletContextService#getPortletContext(org.apache.pluto.container.PortletWindow)
*/
public InternalPortletContext getPortletContext(PortletWindow portletWindow) throws PortletContainerException {
return portletContexts.get(portletWindow.getPortletEntity().getPortletDefinition().getApplication().getName());
@@ -193,7 +193,7 @@
/**
- * @see org.apache.pluto.spi.optional.PortletContextService#getPortletConfig(java.lang.String, java.lang.String)
+ * @see org.apache.pluto.container.spi.optional.PortletContextService#getPortletConfig(java.lang.String, java.lang.String)
*/
public InternalPortletConfig getPortletConfig(String applicationName, String portletName) throws PortletContainerException {
InternalPortletConfig ipc = portletConfigs.get(applicationName + "/" + portletName);
@@ -206,7 +206,7 @@
}
/**
- * @see org.apache.pluto.spi.optional.PortletRegistryService#getPortlet(java.lang.String, java.lang.String)
+ * @see org.apache.pluto.container.spi.optional.PortletRegistryService#getPortlet(java.lang.String, java.lang.String)
*/
public PortletDefinition getPortlet(String applicationName, String portletName) throws PortletContainerException {
InternalPortletConfig ipc = portletConfigs.get(applicationName + "/" + portletName);
@@ -219,7 +219,7 @@
}
/**
- * @see org.apache.pluto.spi.optional.PortletRegistryService#getPortletApplication(java.lang.String)
+ * @see org.apache.pluto.container.spi.optional.PortletRegistryService#getPortletApplication(java.lang.String)
*/
public PortletApplicationDefinition getPortletApplication(String applicationName) throws PortletContainerException {
InternalPortletContext ipc = portletContexts.get(applicationName);
@@ -232,21 +232,21 @@
}
/**
- * @see org.apache.pluto.spi.optional.PortletContextService#getClassLoader(java.lang.String)
+ * @see org.apache.pluto.container.spi.optional.PortletContextService#getClassLoader(java.lang.String)
*/
public ClassLoader getClassLoader(String applicationName){
return classLoaders.get(applicationName);
}
/**
- * @see org.apache.pluto.spi.optional.PortletRegistryService#addPortletRegistryListener(org.apache.pluto.spi.optional.PortletRegistryListener)
+ * @see org.apache.pluto.container.spi.optional.PortletRegistryService#addPortletRegistryListener(org.apache.pluto.container.spi.optional.PortletRegistryListener)
*/
public void addPortletRegistryListener(PortletRegistryListener listener) {
registryListeners.add(listener);
}
/**
- * @see org.apache.pluto.spi.optional.PortletRegistryService#removePortletRegistryListener(org.apache.pluto.spi.optional.PortletRegistryListener)
+ * @see org.apache.pluto.container.spi.optional.PortletRegistryService#removePortletRegistryListener(org.apache.pluto.container.spi.optional.PortletRegistryListener)
*/
public void removePortletRegistryListener(PortletRegistryListener listener) {
registryListeners.remove(listener);
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=752027&r1=752026&r2=752027&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 09:24:41 2009
@@ -22,10 +22,10 @@
import javax.servlet.ServletContext;
-import org.apache.pluto.PlutoConfigurationException;
-import org.apache.pluto.PortletContainerException;
-import org.apache.pluto.om.portlet.PortletApplicationDefinition;
-import org.apache.pluto.services.PortletAppDescriptorService;
+import org.apache.pluto.container.PlutoConfigurationException;
+import org.apache.pluto.container.PortletContainerException;
+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/portlet/ContainerRuntimeOptionType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/ContainerRuntimeOptionType.java?rev=752027&r1=752026&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/ContainerRuntimeOptionType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/ContainerRuntimeOptionType.java Tue Mar 10 09:24:41 2009
@@ -26,7 +26,7 @@
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.pluto.om.portlet.ContainerRuntimeOption;
+import org.apache.pluto.container.om.portlet.ContainerRuntimeOption;
/**
* The container-runtime-option element contains settings for the portlet container that the portlet expects to be
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/CustomPortletModeType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/CustomPortletModeType.java?rev=752027&r1=752026&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/CustomPortletModeType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/CustomPortletModeType.java Tue Mar 10 09:24:41 2009
@@ -27,8 +27,8 @@
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.pluto.om.portlet.CustomPortletMode;
-import org.apache.pluto.om.portlet.Description;
+import org.apache.pluto.container.om.portlet.CustomPortletMode;
+import org.apache.pluto.container.om.portlet.Description;
/**
* A custom portlet mode that one or more portlets in this portlet application supports. If the portal does not need to
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/CustomWindowStateType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/CustomWindowStateType.java?rev=752027&r1=752026&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/CustomWindowStateType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/CustomWindowStateType.java Tue Mar 10 09:24:41 2009
@@ -27,8 +27,8 @@
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.pluto.om.portlet.CustomWindowState;
-import org.apache.pluto.om.portlet.Description;
+import org.apache.pluto.container.om.portlet.CustomWindowState;
+import org.apache.pluto.container.om.portlet.Description;
/**
* A custom window state that one or more portlets in this portlet application supports. Used in: portlet-app <p>Java
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/DescriptionType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/DescriptionType.java?rev=752027&r1=752026&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/DescriptionType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/DescriptionType.java Tue Mar 10 09:24:41 2009
@@ -27,7 +27,7 @@
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.pluto.om.portlet.Description;
+import org.apache.pluto.container.om.portlet.Description;
/**
* The description element is used to provide text describing the parent element. The description element should include
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/DisplayNameType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/DisplayNameType.java?rev=752027&r1=752026&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/DisplayNameType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/DisplayNameType.java Tue Mar 10 09:24:41 2009
@@ -27,7 +27,7 @@
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.pluto.om.portlet.DisplayName;
+import org.apache.pluto.container.om.portlet.DisplayName;
/**
* The display-name type contains a short name that is intended to be displayed by tools. It is used by display-name
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/EventDefinitionReferenceType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/EventDefinitionReferenceType.java?rev=752027&r1=752026&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/EventDefinitionReferenceType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/EventDefinitionReferenceType.java Tue Mar 10 09:24:41 2009
@@ -24,7 +24,7 @@
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import javax.xml.namespace.QName;
-import org.apache.pluto.om.portlet.EventDefinitionReference;
+import org.apache.pluto.container.om.portlet.EventDefinitionReference;
/**
* The event-definition-referenceType is used to reference events declared with the event-definition element at
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/EventDefinitionType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/EventDefinitionType.java?rev=752027&r1=752026&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/EventDefinitionType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/EventDefinitionType.java Tue Mar 10 09:24:41 2009
@@ -29,8 +29,8 @@
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import javax.xml.namespace.QName;
-import org.apache.pluto.om.portlet.Description;
-import org.apache.pluto.om.portlet.EventDefinition;
+import org.apache.pluto.container.om.portlet.Description;
+import org.apache.pluto.container.om.portlet.EventDefinition;
/**
* The event-definitionType is used to declare events the portlet can either receive or emit. The name must be unique
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/FilterMappingType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/FilterMappingType.java?rev=752027&r1=752026&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/FilterMappingType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/FilterMappingType.java Tue Mar 10 09:24:41 2009
@@ -26,7 +26,7 @@
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.pluto.om.portlet.FilterMapping;
+import org.apache.pluto.container.om.portlet.FilterMapping;
/**
* Declaration of the filter mappings in this portlet application is done by using filter-mappingType. The container
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/FilterType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/FilterType.java?rev=752027&r1=752026&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/FilterType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/FilterType.java Tue Mar 10 09:24:41 2009
@@ -25,10 +25,10 @@
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.pluto.om.portlet.Description;
-import org.apache.pluto.om.portlet.DisplayName;
-import org.apache.pluto.om.portlet.Filter;
-import org.apache.pluto.om.portlet.InitParam;
+import org.apache.pluto.container.om.portlet.Description;
+import org.apache.pluto.container.om.portlet.DisplayName;
+import org.apache.pluto.container.om.portlet.Filter;
+import org.apache.pluto.container.om.portlet.InitParam;
/**
* The filter element specifies a filter that can transform the content of portlet requests and portlet responses.
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/InitParamType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/InitParamType.java?rev=752027&r1=752026&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/InitParamType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/InitParamType.java Tue Mar 10 09:24:41 2009
@@ -27,8 +27,8 @@
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.pluto.om.portlet.Description;
-import org.apache.pluto.om.portlet.InitParam;
+import org.apache.pluto.container.om.portlet.Description;
+import org.apache.pluto.container.om.portlet.InitParam;
/**
* The init-param element contains a name/value pair as an initialization param of the portlet Used in:portlet <p>Java
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/ListenerType.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/ListenerType.java?rev=752027&r1=752026&r2=752027&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/ListenerType.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/descriptors/portlet/ListenerType.java Tue Mar 10 09:24:41 2009
@@ -25,9 +25,9 @@
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.pluto.om.portlet.Description;
-import org.apache.pluto.om.portlet.DisplayName;
-import org.apache.pluto.om.portlet.Listener;
+import org.apache.pluto.container.om.portlet.Description;
+import org.apache.pluto.container.om.portlet.DisplayName;
+import org.apache.pluto.container.om.portlet.Listener;
/**
* The listenerType is used to declare listeners for this portlet application. Used in: portlet-app <p>Java class for