weaver      2003/10/05 17:29:56

  Modified:    portal/src/java/org/apache/jetspeed/container/invoker
                        ServletPortletInvoker.java
  Log:
  - changes due to new Pluto drop
    - Some of PortalUtils' methods where moved into CodeUtils
  
  Revision  Changes    Path
  1.4       +15 -16    
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/invoker/ServletPortletInvoker.java
  
  Index: ServletPortletInvoker.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/invoker/ServletPortletInvoker.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ServletPortletInvoker.java        8 Aug 2003 21:59:53 -0000       1.3
  +++ ServletPortletInvoker.java        6 Oct 2003 00:29:56 -0000       1.4
  @@ -55,14 +55,8 @@
   
   import java.io.IOException;
   
  -import javax.servlet.RequestDispatcher;
  -import javax.servlet.ServletContext;
  -import javax.servlet.ServletConfig;
  -import javax.servlet.ServletRequest;
  -import javax.servlet.ServletResponse;
  -
  -import javax.portlet.ActionResponse;
   import javax.portlet.ActionRequest;
  +import javax.portlet.ActionResponse;
   import javax.portlet.PortletConfig;
   import javax.portlet.PortletContext;
   import javax.portlet.PortletException;
  @@ -70,18 +64,23 @@
   import javax.portlet.PortletResponse;
   import javax.portlet.RenderRequest;
   import javax.portlet.RenderResponse;
  +import javax.servlet.RequestDispatcher;
  +import javax.servlet.ServletConfig;
  +import javax.servlet.ServletContext;
  +import javax.servlet.ServletRequest;
  +import javax.servlet.ServletResponse;
   
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  -import org.apache.pluto.invoker.PortletInvoker;
  -import org.apache.pluto.om.portlet.PortletApplicationDefinition;
  -import org.apache.pluto.om.portlet.PortletDefinition;
  +import org.apache.jetspeed.container.ContainerConstants;
  +import org.apache.jetspeed.container.PortletContextFactory;
  +import org.apache.pluto.core.CoreUtils;
   import org.apache.pluto.core.InternalPortletRequest;
   import org.apache.pluto.core.InternalPortletResponse;
   import org.apache.pluto.core.impl.PortletConfigImpl;
  -import org.apache.pluto.portlet.PortletUtils;
  -import org.apache.jetspeed.container.ContainerConstants;
  -import org.apache.jetspeed.container.PortletContextFactory;
  +import org.apache.pluto.invoker.PortletInvoker;
  +import org.apache.pluto.om.portlet.PortletApplicationDefinition;
  +import org.apache.pluto.om.portlet.PortletDefinition;
   
   /**
    * Portlet Invoker implementation, invokes the JetspeedContainerServlet
  @@ -160,9 +159,9 @@
           String portletApplicationName = 
app.getWebApplicationDefinition().getContextRoot();
           //String portletApplicationName = "/HW_App";
   
  -        InternalPortletRequest internalPortletRequest = 
PortletUtils.getInternalRequest(portletRequest);
  +        InternalPortletRequest internalPortletRequest = 
CoreUtils.getInternalRequest(portletRequest);
   
  -        InternalPortletResponse internalPortletResponse = 
PortletUtils.getInternalResponse(portletResponse);
  +        InternalPortletResponse internalPortletResponse = 
CoreUtils.getInternalResponse(portletResponse);
   
           // gather all required data from request and response
           ServletRequest servletRequest = 
((javax.servlet.http.HttpServletRequestWrapper) internalPortletRequest).getRequest();
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to