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/engine/servlet ServletRequestImpl.java
Date Fri, 21 May 2004 20:54:56 GMT
taylor      2004/05/21 13:54:56

  Modified:    portal/src/java/org/apache/jetspeed/engine/servlet
                        ServletRequestImpl.java
  Log:
  DLS: Regarding retrieving portlet definitions from the entity.
  
  I had this working by the code changes I made here.
  Its a mystery to me as to why, but it seemed to work whereas 
  the commented code did not because the code goes to the same
  object in the implementation (assuming ive got the right impl)
  
  Unfortantely, with the introduction of RC6 of OJB
  we are now seeing some new errors in retrieving the rowset
  Thus I no longer get this far in debugging...
  
  Anyway I will try to debug the newly introduced RC6 bug later today
  
  PR:
  Obtained from:
  Submitted by:	
  Reviewed by:	
  CVS: ----------------------------------------------------------------------
  CVS: PR:
  CVS:   If this change addresses a PR in the problem report tracking
  CVS:   database, then enter the PR number(s) here.
  CVS: Obtained from:
  CVS:   If this change has been taken from another system, such as NCSA,
  CVS:   then name the system in this line, otherwise delete it.
  CVS: Submitted by:
  CVS:   If this code has been contributed to Apache by someone else; i.e.,
  CVS:   they sent us a patch or a new module, then include their name/email
  CVS:   address here. If this is your work then delete this line.
  CVS: Reviewed by:
  CVS:   If we are doing pre-commit code reviews and someone else has
  CVS:   reviewed your changes, include their name(s) here.
  CVS:   If you have not had it reviewed then delete this line.
  
  Revision  Changes    Path
  1.14      +16 -5     jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java
  
  Index: ServletRequestImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ServletRequestImpl.java	19 May 2004 02:13:14 -0000	1.13
  +++ ServletRequestImpl.java	21 May 2004 20:54:54 -0000	1.14
  @@ -35,6 +35,7 @@
   import org.apache.pluto.om.common.SecurityRoleSet;
   import org.apache.pluto.om.portlet.PortletDefinition;
   import org.apache.pluto.om.entity.PortletApplicationEntity;
  +import org.apache.pluto.om.entity.PortletEntity;
   import org.apache.pluto.om.portlet.PortletApplicationDefinition;
   import org.apache.pluto.om.window.PortletWindow;
   
  @@ -56,6 +57,7 @@
           super(servletRequest);
   
           this.portletWindow = window;
  +        System.out.println("Constructing SRI: " + window.getId());
       }
   
       private HttpServletRequest _getHttpServletRequest()
  @@ -200,16 +202,25 @@
                   getAttribute("org.apache.jetspeed.request.RequestContext");
               if (null != context)
               { 
  +                String entityID = "--NULL--";
  +                PortletEntity entity = portletWindow.getPortletEntity();
  +                if (entity != null)
  +                {
  +                    entityID = entity.getId().toString();
  +                }
                   PortletApplicationEntity portletAppEntity = portletWindow.getPortletEntity().getPortletApplicationEntity();
  -                if (null != portletAppEntity)
  +                PortletApplicationDefinition portletAppDef = entity.getPortletDefinition().getPortletApplicationDefinition();
  +                
  +                // if (null != portletAppEntity)
  +                if (null != portletAppDef)
                   {
  -                    PortletApplicationDefinition portletAppDef = portletAppEntity.getPortletApplicationDefinition();
  +                    // PortletApplicationDefinition portletAppDef = portletAppEntity.getPortletApplicationDefinition();
                       value = context.getUserInfoMap(portletAppDef.getId()); 
                       System.out.println("_____________HERE0: " + ((Map) value).size());
                   }
                   else
  -                {
  -                    System.out.println("_____________HERE1: Entity is null!!!!");
  +                {                    
  +                    System.out.println("_____________HERE1: Entity is null!!!! " + entityID);
                   }
                     
               }
  
  
  

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