portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/invoker AbstractPortletInvokerFactory.java
Date Thu, 08 Jan 2004 20:40:33 GMT
taylor      2004/01/08 12:40:33

  Modified:    portal/src/java/org/apache/jetspeed/aggregator
                        PageAggregator.java
               portal/src/java/org/apache/jetspeed/container/invoker
                        AbstractPortletInvokerFactory.java
  Log:
  * fixed bug in AbstractPortletInvokerFactory causing recursive loop
  * enabled using profiles in page aggregator
  
  Revision  Changes    Path
  1.5       +4 -6      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/PageAggregator.java
  
  Index: PageAggregator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/PageAggregator.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- PageAggregator.java	8 Jan 2004 04:02:08 -0000	1.4
  +++ PageAggregator.java	8 Jan 2004 20:40:32 -0000	1.5
  @@ -137,20 +137,18 @@
       {
   
           PortletRenderer renderer = (PortletRenderer)CommonPortletServices.getPortalService(PortletRenderer.SERVICE_NAME);
  -/*
  +        ProfilerService profiler = (ProfilerService)CommonPortletServices.getPortalService(ProfilerService.SERVICE_NAME);
  +        
           ProfileLocator locator = context.getProfileLocator();
           if (null == locator)
           {
               throw new JetspeedException("Failed to find ProfileLocator in BasicAggregator.build");
           }
  -        Page page = Profiler.getPage(locator);
  +        Page page = profiler.getPage(locator);
           if (null == page)
           {
               throw new JetspeedException("Failed to find PSML Pin BasicAggregator.build");
           }
  -*/
  -        //DEBUG CODE: use this to test a specific page
  -        Page page = org.apache.jetspeed.services.page.PageManager.getPage("p001");
           context.setPage(page);
   
           //Set default acl
  
  
  
  1.3       +2 -3      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/invoker/AbstractPortletInvokerFactory.java
  
  Index: AbstractPortletInvokerFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/invoker/AbstractPortletInvokerFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractPortletInvokerFactory.java	8 Jan 2004 03:14:12 -0000	1.2
  +++ AbstractPortletInvokerFactory.java	8 Jan 2004 20:40:33 -0000	1.3
  @@ -103,7 +103,6 @@
       public void passivateObject(Object object) throws Exception 
       {
           JetspeedPortletInvoker invoker = (JetspeedPortletInvoker)object;
  -        invoker.passivate();        
           pool.returnObject(invoker);
       }
   
  @@ -111,7 +110,7 @@
        * @see org.apache.commons.pool.PoolableObjectFactory#makeObject()
        */
       public Object makeObject() throws Exception
  -    {
  +    {        
           return Class.forName(invokerClass).newInstance();
       }
       
  
  
  

---------------------------------------------------------------------
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