cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/portal/service JetspeedPersistenceService.java

[raphael]

raphael     01/05/28 08:07:41

  Modified:    src/java/org/apache/jetspeed/portal/service
                        JetspeedPersistenceService.java
  Log:
  fix PersistenceService to work with new Profiler
  
  Revision  Changes    Path
  1.5       +15 -9     
jakarta-jetspeed/src/java/org/apache/jetspeed/portal/service/JetspeedPersistenceService.java
  
  Index: JetspeedPersistenceService.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/service/JetspeedPersistenceService.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JetspeedPersistenceService.java   2001/05/07 15:40:26     1.4
  +++ JetspeedPersistenceService.java   2001/05/28 15:07:41     1.5
  @@ -61,6 +61,7 @@
   import javax.servlet.http.*;
   
   import org.apache.turbine.util.RunData;
  +import org.apache.turbine.util.Log;
   import org.apache.jetspeed.capability.CapabilityMap;
   import org.apache.jetspeed.capability.CapabilityMapFactory;
   import org.apache.jetspeed.portal.factory.PortletSetFactory;
  @@ -190,13 +191,17 @@
       public PersistenceService.Page getPage ()
       {
           Page page = null;
  +        String pageName = null;
   
  -        CapabilityMap cap = CapabilityMapFactory.getCapabilityMap (iRunData);
  -
  -        String pageName = "HTML";
  -
  -        if (cap.getPreferredType ().equals (MimeType.WML))
  -            pageName = "WML";
  +        try
  +        {
  +            Profile profile = Profiler.getSessionProfile(iRunData);
  +            pageName = profile.getURL();
  +        }
  +        catch (ProfileException ex)
  +        {
  +            Log.error(ex);
  +        }
   
           for (Enumeration e = getPages (); e.hasMoreElements (); )
           {
  @@ -251,12 +256,13 @@
   
           if (entry != null)
           {
  -            Page page = (Page) iRunData.getUser().getTemp(aPortletName); // + "." + 
pageName);
  +            String pid = aPortletName + "." + pageName;
  +            Page page = (Page) iRunData.getUser().getTemp(pid);
   
               if (page == null)
               {
  -                page = new Page (aPortletName, portlets, entry);  // pageName
  -                iRunData.getUser().setTemp(aPortletName, page); // + pageName, 
page);
  +                page = new Page (pageName, portlets, entry);
  +                iRunData.getUser().setTemp(pid, page);
               }
   
               iPages.add (page);
  
  
  

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