svn commit: r123380 - /portals/pluto/branches/pluto-1.1/container/src/java/org/apache/pluto/core/impl/PortletRequestImpl.java

[dd...@apache.org]

Author: ddewolf
Date: Sun Dec 26 18:25:29 2004
New Revision: 123380

URL: http://svn.apache.org/viewcvs?view=rev&rev=123380
Log:
(oops, missed one source in last commit)
Several Bug Fixes:
-- Ensure that the PortletSession is initialized with the PortletContext
-- Ensure that the PortletRequest is initialized with the PortletContext
-- Rework the deployment to include tld file within the war
-- Remove the tld declaration within the web.xml of the testsuite
-- Remove unneeded methods from InternalPortletRequest
-- Refactor the deployer to make Assembler more flexible and more configurable.
Modified:
   portals/pluto/branches/pluto-1.1/container/src/java/org/apache/pluto/core/impl/PortletRequestImpl.java

Modified: portals/pluto/branches/pluto-1.1/container/src/java/org/apache/pluto/core/impl/PortletRequestImpl.java
Url: http://svn.apache.org/viewcvs/portals/pluto/branches/pluto-1.1/container/src/java/org/apache/pluto/core/impl/PortletRequestImpl.java?view=diff&rev=123380&p1=portals/pluto/branches/pluto-1.1/container/src/java/org/apache/pluto/core/impl/PortletRequestImpl.java&r1=123379&p2=portals/pluto/branches/pluto-1.1/container/src/java/org/apache/pluto/core/impl/PortletRequestImpl.java&r2=123380
==============================================================================
--- portals/pluto/branches/pluto-1.1/container/src/java/org/apache/pluto/core/impl/PortletRequestImpl.java	(original)
+++ portals/pluto/branches/pluto-1.1/container/src/java/org/apache/pluto/core/impl/PortletRequestImpl.java	Sun Dec 26 18:25:29 2004
@@ -30,7 +30,9 @@
 import javax.portlet.PortletRequest;
 import javax.portlet.PortletSession;
 import javax.portlet.WindowState;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
+import javax.servlet.http.HttpSession;
 
 import org.apache.pluto.PortletContainer;
 import org.apache.pluto.binding.PortletDD;
@@ -95,7 +97,7 @@
 
     public PortletRequestImpl(PortletContainer container,
                               InternalPortletWindow internalPortletWindow,
-                              javax.servlet.http.HttpServletRequest servletRequest) {
+                              HttpServletRequest servletRequest) {
         super(servletRequest);
         this.container = container;
         this.internalPortletWindow = internalPortletWindow;
@@ -145,7 +147,7 @@
 
     public PortletSession getPortletSession(boolean create) {
         // check if the session was invalidated
-        javax.servlet.http.HttpSession httpSession = this.getHttpServletRequest()
+        HttpSession httpSession = this.getHttpServletRequest()
             .getSession(false);
 
         if ((portletSession != null) && (httpSession == null)) {
@@ -467,12 +469,6 @@
 
     // --------------------------------------------------------------------------------------------
 
-    // org.apache.pluto.core.InternalPortletRequest implementation --------------------------------
-    public void lateInit(
-        javax.servlet.http.HttpServletRequest webModuleServletRequest) {
-        super.setRequest(webModuleServletRequest);
-    }
-
     public InternalPortletWindow getInternalPortletWindow() {
         return internalPortletWindow;
     }
@@ -487,8 +483,8 @@
     // --------------------------------------------------------------------------------------------
 
     // internal methods ---------------------------------------------------------------------------
-    private javax.servlet.http.HttpServletRequest getHttpServletRequest() {
-        return (javax.servlet.http.HttpServletRequest) super.getRequest();
+    private HttpServletRequest getHttpServletRequest() {
+        return (HttpServletRequest) super.getRequest();
     }
 
     /**
@@ -501,7 +497,7 @@
     // --------------------------------------------------------------------------------------------
 
     // additional methods
-    // javax.servlet.http.HttpServletRequestWrapper
+    // .HttpServletRequestWrapper
     public java.lang.String getCharacterEncoding() {
         return this.getHttpServletRequest().getCharacterEncoding();
     }