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 ed...@apache.org on 2008/11/19 01:09:02 UTC
svn commit: r718814 - in /portals/pluto/trunk:
pluto-container-api/src/main/java/org/apache/pluto/internal/
pluto-container-api/src/main/java/org/apache/pluto/spi/optional/
pluto-container/src/main/java/org/apache/pluto/core/
pluto-container/src/main/j...
Author: edalquist
Date: Tue Nov 18 16:09:01 2008
New Revision: 718814
URL: http://svn.apache.org/viewvc?rev=718814&view=rev
Log:
PLUTO-504 Create the PortletSession via the PortletEnvironmentService
Added:
portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/internal/InternalPortletSession.java (with props)
Modified:
portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/optional/PortletEnvironmentService.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletEnvironmentService.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletSessionImpl.java
portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/PortletRequestImplTest.java
Added: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/internal/InternalPortletSession.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/internal/InternalPortletSession.java?rev=718814&view=auto
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/internal/InternalPortletSession.java (added)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/internal/InternalPortletSession.java Tue Nov 18 16:09:01 2008
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.pluto.internal;
+
+import javax.portlet.PortletSession;
+import javax.servlet.http.HttpSession;
+
+/**
+ * The internal portlet session interface extends PortletSession and adds
+ * some methods used by Pluto.
+ */
+public interface InternalPortletSession extends PortletSession {
+ /**
+ * Access to the wrapped HttpSession
+ * @return The wrapped HttpSession
+ */
+ public HttpSession getHttpSession();
+}
Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/internal/InternalPortletSession.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/internal/InternalPortletSession.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/optional/PortletEnvironmentService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/optional/PortletEnvironmentService.java?rev=718814&r1=718813&r2=718814&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/optional/PortletEnvironmentService.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/spi/optional/PortletEnvironmentService.java Tue Nov 18 16:09:01 2008
@@ -16,13 +16,16 @@
*/
package org.apache.pluto.spi.optional;
+import javax.portlet.PortletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
import org.apache.pluto.PortletContainer;
+import org.apache.pluto.PortletWindow;
import org.apache.pluto.internal.InternalActionRequest;
import org.apache.pluto.internal.InternalActionResponse;
-import org.apache.pluto.PortletWindow;
+import org.apache.pluto.internal.InternalPortletSession;
import org.apache.pluto.internal.InternalRenderRequest;
import org.apache.pluto.internal.InternalRenderResponse;
import org.apache.pluto.internal.InternalResourceRequest;
@@ -59,6 +62,13 @@
HttpServletResponse servletResponse,
PortletWindow portletWindow);
+ InternalPortletSession createPortletSession(
+ PortletContainer container,
+ HttpServletRequest servletRequest,
+ PortletContext portletContext,
+ HttpSession httpSession,
+ PortletWindow portletWindow);
+
InternalResourceRequest createResourceRequest(
PortletContainer container,
HttpServletRequest servletRequest,
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=718814&r1=718813&r2=718814&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 Nov 18 16:09:01 2008
@@ -17,19 +17,23 @@
*/
package org.apache.pluto.core;
+import javax.portlet.PortletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
import org.apache.pluto.PortletContainer;
import org.apache.pluto.PortletWindow;
import org.apache.pluto.internal.InternalActionRequest;
import org.apache.pluto.internal.InternalActionResponse;
+import org.apache.pluto.internal.InternalPortletSession;
import org.apache.pluto.internal.InternalRenderRequest;
import org.apache.pluto.internal.InternalRenderResponse;
import org.apache.pluto.internal.InternalResourceRequest;
import org.apache.pluto.internal.InternalResourceResponse;
import org.apache.pluto.internal.impl.ActionRequestImpl;
import org.apache.pluto.internal.impl.ActionResponseImpl;
+import org.apache.pluto.internal.impl.PortletSessionImpl;
import org.apache.pluto.internal.impl.RenderRequestImpl;
import org.apache.pluto.internal.impl.RenderResponseImpl;
import org.apache.pluto.internal.impl.ResourceRequestImpl;
@@ -69,6 +73,15 @@
PortletWindow portletWindow) {
return new RenderResponseImpl(container, portletWindow, request, response);
}
+
+ public InternalPortletSession createPortletSession(PortletContainer container,
+ HttpServletRequest servletRequest,
+ PortletContext portletContext,
+ HttpSession httpSession,
+ PortletWindow portletWindow) {
+
+ return new PortletSessionImpl(portletContext, portletWindow, httpSession);
+ }
public InternalResourceRequest createResourceRequest(PortletContainer container,
HttpServletRequest request,
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java?rev=718814&r1=718813&r2=718814&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java Tue Nov 18 16:09:01 2008
@@ -38,7 +38,6 @@
import javax.ccpp.Profile;
import javax.portlet.PortalContext;
-import javax.portlet.PortletContext;
import javax.portlet.PortletMode;
import javax.portlet.PortletPreferences;
import javax.portlet.PortletRequest;
@@ -63,10 +62,12 @@
import org.apache.pluto.PortletWindow;
import org.apache.pluto.internal.InternalPortletContext;
import org.apache.pluto.internal.InternalPortletRequest;
+import org.apache.pluto.internal.InternalPortletSession;
import org.apache.pluto.om.portlet.PortletDefinition;
import org.apache.pluto.om.portlet.SecurityRoleRef;
import org.apache.pluto.om.portlet.Supports;
import org.apache.pluto.spi.PortletURLProvider;
+import org.apache.pluto.spi.optional.PortletEnvironmentService;
import org.apache.pluto.spi.optional.RequestAttributeService;
import org.apache.pluto.util.ArgumentUtility;
import org.apache.pluto.util.Enumerator;
@@ -124,7 +125,7 @@
private PortalContext portalContext;
/** The portlet session. */
- private PortletSessionImpl portletSession;
+ private InternalPortletSession portletSession;
/** Response content types. */
private Vector contentTypes;
@@ -290,10 +291,14 @@
if (LOG.isDebugEnabled()) {
LOG.debug("Creating new portlet session...");
}
- portletSession = new PortletSessionImpl(
- portletContext,
- portletWindow,
- httpSession);
+ final OptionalContainerServices optionalContainerServices = container.getOptionalContainerServices();
+ final PortletEnvironmentService portletEnvironmentService = optionalContainerServices.getPortletEnvironmentService();
+
+ portletSession = portletEnvironmentService.createPortletSession(container,
+ getHttpServletRequest(),
+ portletContext,
+ httpSession,
+ portletWindow);
}
return portletSession;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletSessionImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletSessionImpl.java?rev=718814&r1=718813&r2=718814&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletSessionImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletSessionImpl.java Tue Nov 18 16:09:01 2008
@@ -31,13 +31,14 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.pluto.PortletWindow;
+import org.apache.pluto.internal.InternalPortletSession;
import org.apache.pluto.util.ArgumentUtility;
/**
* Implementation of the <code>javax.portlet.PortletSession</code> interface.
*
*/
-public class PortletSessionImpl implements PortletSession {
+public class PortletSessionImpl implements InternalPortletSession {
/** Logger. */
private static final Log LOG = LogFactory.getLog(PortletSessionImpl.class);
@@ -76,11 +77,9 @@
this.httpSession = httpSession;
}
- /**
- * Packaged scope access to the wrapped HttpSession for usage from PortletRequestImpl.getSession()
- * @return wrapped HttpSession
- */
- HttpSession getHttpSession()
+ // InternalPortletSession Impl -----------------------------------------
+
+ public HttpSession getHttpSession()
{
return httpSession;
}
Modified: portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/PortletRequestImplTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/PortletRequestImplTest.java?rev=718814&r1=718813&r2=718814&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/PortletRequestImplTest.java (original)
+++ portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/PortletRequestImplTest.java Tue Nov 18 16:09:01 2008
@@ -24,12 +24,14 @@
import org.apache.pluto.OptionalContainerServices;
import org.apache.pluto.PortletContainer;
+import org.apache.pluto.PortletWindow;
import org.apache.pluto.RequiredContainerServices;
import org.apache.pluto.core.PortletContainerImpl;
import org.apache.pluto.internal.InternalPortletContext;
import org.apache.pluto.internal.InternalPortletRequest;
-import org.apache.pluto.PortletWindow;
+import org.apache.pluto.internal.InternalPortletSession;
import org.apache.pluto.spi.CCPPProfileService;
+import org.apache.pluto.spi.optional.PortletEnvironmentService;
import org.apache.pluto.spi.optional.RequestAttributeService;
import org.jmock.Mock;
import org.jmock.cglib.MockObjectTestCase;
@@ -70,7 +72,7 @@
mockPortletContext = mock( InternalPortletContext.class );
mockContainer = mock( PortletContainerImpl.class,
new Class[] { String.class, RequiredContainerServices.class, OptionalContainerServices.class },
- new Object[] { "Mock Pluto Container", (RequiredContainerServices) mockServices.proxy(), null } );
+ new Object[] { "Mock Pluto Container", (RequiredContainerServices) mockServices.proxy(), (OptionalContainerServices) mockOptionalServices.proxy() } );
window = (PortletWindow) mock( PortletWindow.class ).proxy();
mockHttpServletRequest = mock( HttpServletRequest.class );
mockRequestAttributeService = mock (RequestAttributeService.class);
@@ -93,6 +95,10 @@
// of a servlet container that doesn't initialize
// its value.
long lastAccessedTime = 0L; // in milliseconds
+
+ Mock mockPortletEnvironmentService = mock( PortletEnvironmentService.class );
+
+ mockOptionalServices.expects( once() ).method( "getPortletEnvironmentService" ).will( returnValue( mockPortletEnvironmentService.proxy() ));
mockCCPPProfileService.expects(once()).method("getCCPPProfile").will(returnValue( null ));
@@ -128,6 +134,9 @@
// After applying PLUTO-474, invalidate() should never be called
mockHttpSession.expects( never() ).method( "invalidate" );
+ Mock mockPortletSession = mock( InternalPortletSession.class );
+ mockPortletEnvironmentService.expects( once() ).method( "createPortletSession" ).will( returnValue( mockPortletSession.proxy() ));
+
PortletSession s = request.getPortletSession( true );
}