portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/request JetspeedRequestContextComponent.java JetspeedRequestContext.java
Date Wed, 23 Mar 2005 22:52:20 GMT
ate         2005/03/23 14:52:20

  Modified:    portal/src/java/org/apache/jetspeed/request
                        JetspeedRequestContextComponent.java
                        JetspeedRequestContext.java
  Log:
  Resolving http://issues.apache.org/jira/browse/JS2-210:
  New portlet container access and invokation implementation
  
  Revision  Changes    Path
  1.11      +4 -8      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/request/JetspeedRequestContextComponent.java
  
  Index: JetspeedRequestContextComponent.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/request/JetspeedRequestContextComponent.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- JetspeedRequestContextComponent.java	27 Jan 2005 21:27:52 -0000	1.10
  +++ JetspeedRequestContextComponent.java	23 Mar 2005 22:52:20 -0000	1.11
  @@ -25,7 +25,6 @@
   import org.apache.commons.logging.LogFactory;
   
   import org.apache.jetspeed.PortalReservedParameters;
  -import org.apache.jetspeed.factory.PortletFactory;
   import org.apache.jetspeed.userinfo.UserInfoManager;
   
   /**
  @@ -43,18 +42,16 @@
       private ThreadLocal tlRequestContext = new ThreadLocal();
   
       private final static Log log = LogFactory.getLog(JetspeedRequestContextComponent.class);
  -    private PortletFactory portletFactory;
   
       public JetspeedRequestContextComponent(String contextClassName)
       {
       }
   
       public JetspeedRequestContextComponent(String contextClassName, 
  -                                           UserInfoManager userInfoMgr, PortletFactory
portletFactory)
  +                                           UserInfoManager userInfoMgr)
       {
           this.contextClassName = contextClassName;
           this.userInfoMgr = userInfoMgr;
  -        this.portletFactory = portletFactory;
       }
   
       public RequestContext create(HttpServletRequest req, HttpServletResponse resp, ServletConfig
config)
  @@ -75,9 +72,8 @@
                           HttpServletRequest.class,
                           HttpServletResponse.class,
                           ServletConfig.class,
  -                        UserInfoManager.class,
  -                        PortletFactory.class});
  -            context = (RequestContext) constructor.newInstance(new Object[] { req, resp,
config, userInfoMgr, portletFactory });
  +                        UserInfoManager.class});
  +            context = (RequestContext) constructor.newInstance(new Object[] { req, resp,
config, userInfoMgr});
   
           }
           catch (Exception e)
  
  
  
  1.38      +1 -6      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/request/JetspeedRequestContext.java
  
  Index: JetspeedRequestContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/request/JetspeedRequestContext.java,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- JetspeedRequestContext.java	27 Jan 2005 21:27:51 -0000	1.37
  +++ JetspeedRequestContext.java	23 Mar 2005 22:52:20 -0000	1.38
  @@ -36,7 +36,6 @@
   import org.apache.jetspeed.container.url.PortalURL;
   import org.apache.jetspeed.engine.servlet.ServletRequestFactory;
   import org.apache.jetspeed.engine.servlet.ServletResponseFactory;
  -import org.apache.jetspeed.factory.PortletFactory;
   import org.apache.jetspeed.om.common.MutableLanguage;
   import org.apache.jetspeed.om.impl.LanguageImpl;
   import org.apache.jetspeed.om.page.Fragment;
  @@ -47,7 +46,6 @@
   import org.apache.pluto.om.common.LanguageSet;
   import org.apache.pluto.om.common.ObjectID;
   import org.apache.pluto.om.portlet.PortletDefinition;
  -import org.apache.pluto.om.portlet.PortletDefinitionCtrl;
   import org.apache.pluto.om.window.PortletWindow;
   
   /**
  @@ -86,7 +84,6 @@
       private Fragment rootFragment;
       private Map fragments;
       private JetspeedPowerTool jpt;
  -    private PortletFactory portletFactory;
   
       /**
        * Create a new Request Context
  @@ -97,7 +94,7 @@
        * @param config
        */
       public JetspeedRequestContext( HttpServletRequest request, HttpServletResponse response,
ServletConfig config,
  -            UserInfoManager userInfoMgr, PortletFactory portletFactory )
  +            UserInfoManager userInfoMgr )
       {
           this.request = request;
           this.response = response;
  @@ -106,7 +103,6 @@
           this.requestsForWindows = new HashMap();
           this.responsesForWindows = new HashMap();
           this.fragments = new LinkedHashMap();
  -        this.portletFactory = portletFactory;
   
           // set context in Request for later use
           if (null != this.request)
  @@ -494,7 +490,6 @@
           // {
           //     return language;
           // }
  -        ((PortletDefinitionCtrl) portlet).setPortletClassLoader(portletFactory.getPortletClassLoader(portlet));
           LanguageSet languageSet = portlet.getLanguageSet();
           Language language = languageSet.get(locale);
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org


Mime
View raw message