portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From morci...@apache.org
Subject cvs commit: jakarta-jetspeed/xdocs changes.xml
Date Fri, 10 Jan 2003 23:06:05 GMT
morciuch    2003/01/10 15:06:05

  Modified:    docs/site changes.html
               src/java/org/apache/jetspeed/portal/security/portlets
                        PortletWrapper.java
               webapp/WEB-INF/templates/vm/controls/html jetspeed.vm
               xdocs    changes.xml
  Log:
  Restored prior version of the PortletWrapper - the access logging logic was in the right
place and the problem was in jetspeed.vm template (see Bugzilla issue# 15595).
  
  Revision  Changes    Path
  1.92      +3 -0      jakarta-jetspeed/docs/site/changes.html
  
  Index: changes.html
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/docs/site/changes.html,v
  retrieving revision 1.91
  retrieving revision 1.92
  diff -u -r1.91 -r1.92
  --- changes.html	6 Jan 2003 17:39:21 -0000	1.91
  +++ changes.html	10 Jan 2003 23:06:04 -0000	1.92
  @@ -133,6 +133,9 @@
   </li>
   -->
   <li>
  +  Fixed - Bug # 15595 - 2003/01/10 - Fixed problem with logging portlet access - again
and for good (MO)
  +</li>
  +<li>
     Fixed - Bug # 15818 - 2003/01/06 - Removed reduntant permission checks  (MO)
   </li>
   <li>
  
  
  
  1.17      +9 -8      jakarta-jetspeed/src/java/org/apache/jetspeed/portal/security/portlets/PortletWrapper.java
  
  Index: PortletWrapper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/security/portlets/PortletWrapper.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- PortletWrapper.java	22 Dec 2002 21:22:59 -0000	1.16
  +++ PortletWrapper.java	10 Jan 2003 23:06:04 -0000	1.17
  @@ -140,10 +140,18 @@
   
           if (checkPermission(rundata, JetspeedSecurity.PERMISSION_VIEW))
           {
  +            if (PortletStats.isEnabled())
  +            {
  +                PortletStats.logAccess(rundata, this, PortletStats.ACCESS_OK);
  +            }
               return wrappedPortlet.getContent(rundata);
           }
           else 
           {
  +            if (PortletStats.isEnabled())
  +            {
  +                PortletStats.logAccess(rundata, this, PortletStats.ACCESS_DENIED);
  +            }
               return new JetspeedClearElement("Sorry, you have no permission to see this
portlet");
           }
       }
  @@ -310,16 +318,9 @@
                       + portalResource.getOwner());
           }
           
  -        boolean accessOk = JetspeedSecurity.checkPermission((JetspeedUser) rundata.getUser(),
  +        return JetspeedSecurity.checkPermission((JetspeedUser) rundata.getUser(),
                                                    portalResource,
                                                    permissionName);
  -
  -        if (PortletStats.isEnabled() && permissionName.equals(JetspeedSecurity.PERMISSION_VIEW))
  -        {
  -            PortletStats.logAccess(rundata, this, accessOk ? PortletStats.ACCESS_OK : PortletStats.ACCESS_DENIED);
  -        }
  -
  -        return accessOk;
       }
   
       // utility methods
  
  
  
  1.14      +1 -1      jakarta-jetspeed/webapp/WEB-INF/templates/vm/controls/html/jetspeed.vm
  
  Index: jetspeed.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controls/html/jetspeed.vm,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- jetspeed.vm	24 Sep 2002 00:16:19 -0000	1.13
  +++ jetspeed.vm	10 Jan 2003 23:06:05 -0000	1.14
  @@ -67,7 +67,7 @@
         <table border="0" cellpadding="2" cellspacing="0" width="100%" align="center"
#if (${skin.ContentStyleClass}) class="${skin.ContentStyleClass}" #end #if (${contentstyle})
style="${contentstyle}" #end >
           <tr>
             <td>
  -            $!portlet_instance.Content
  +            $!portlet.getContent($data)
             </td>
           </tr>
         </table>
  
  
  
  1.109     +4 -1      jakarta-jetspeed/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/xdocs/changes.xml,v
  retrieving revision 1.108
  retrieving revision 1.109
  diff -u -r1.108 -r1.109
  --- changes.xml	6 Jan 2003 17:39:22 -0000	1.108
  +++ changes.xml	10 Jan 2003 23:06:05 -0000	1.109
  @@ -23,6 +23,9 @@
   </li>
   -->
   <li>
  +  Fixed - Bug # 15595 - 2003/01/10 - Fixed problem with logging portlet access - again
and for good (MO)
  +</li>
  +<li>
     Fixed - Bug # 15818 - 2003/01/06 - Removed reduntant permission checks  (MO)
   </li>
   <li>
  
  
  

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


Mime
View raw message