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/tools/pamanager PortletDescriptorUtilities.java
Date Sat, 28 Feb 2004 20:05:50 GMT
taylor      2004/02/28 12:05:50

  Modified:    portal/src/java/org/apache/jetspeed/capability/impl
                        CapabilityMapImpl.java CapabilityValveImpl.java
                        JetspeedCapabilities.java
               portal/src/java/org/apache/jetspeed/tools/pamanager
                        PortletDescriptorUtilities.java
  Log:
  debug statements for Roger to see what Im trying to explain to him
  
  Revision  Changes    Path
  1.4       +10 -2     jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/capability/impl/CapabilityMapImpl.java
  
  Index: CapabilityMapImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/capability/impl/CapabilityMapImpl.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CapabilityMapImpl.java	26 Dec 2003 16:24:27 -0000	1.3
  +++ CapabilityMapImpl.java	28 Feb 2004 20:05:50 -0000	1.4
  @@ -128,15 +128,23 @@
       {
           // Return the value that matches the preferredMimeType defined in the Client
           int prefMimeTypeId = this.client.getPreferredMimeTypeId();
  +System.out.println("+++ MIMETYPE ID is " + prefMimeTypeId);
  +System.out.println("+++ CLIENT is " + client.getName());        
  +
           MimeType mt = null;
   
  +System.out.println("+++ MIMETYPE MAP SIZE is " + mimeTypeMap.values().size());        
  +        
           Iterator e = this.mimeTypeMap.values().iterator();
           while (e.hasNext())
  -        {
  +        {            
               mt = (MimeType) e.next();
  +System.out.println("+++ MT ID is " + mt.getMimetypeId());        
  +            
               if (mt.getMimetypeId() == prefMimeTypeId)
                   return mt;
           }
  +System.out.println("+++ NEVER " + prefMimeTypeId);        
   
           // Should never reach this point. A preferred value needs to be set
           return null; // TODO: NEVER RETURN NULL
  
  
  
  1.6       +2 -1      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/capability/impl/CapabilityValveImpl.java
  
  Index: CapabilityValveImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/capability/impl/CapabilityValveImpl.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CapabilityValveImpl.java	26 Feb 2004 22:50:41 -0000	1.5
  +++ CapabilityValveImpl.java	28 Feb 2004 20:05:50 -0000	1.6
  @@ -151,6 +151,7 @@
           } 
           catch (Exception e)
           {
  +            e.printStackTrace();
               throw new PipelineException(e);
           }
           // Pass control to the next Valve in the Pipeline
  
  
  
  1.2       +5 -4      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/capability/impl/JetspeedCapabilities.java
  
  Index: JetspeedCapabilities.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/capability/impl/JetspeedCapabilities.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JetspeedCapabilities.java	26 Feb 2004 22:50:41 -0000	1.1
  +++ JetspeedCapabilities.java	28 Feb 2004 20:05:50 -0000	1.2
  @@ -137,6 +137,8 @@
        */
       public CapabilityMap getCapabilityMap(String userAgent)
       {
  +        log.error("*****************************HELLO*****************");
  +        
           CapabilityMap map = null;
           boolean bClientFound = false;
   
  @@ -214,8 +216,6 @@
                   }
   
                   //Set preferred Mimetype
  -                MimeType mimeType = map.getPreferredType();
  -
                   MediaType mtEntry =
                       getMediaTypeForMimeType(map.getPreferredType().getName());
   
  @@ -386,9 +386,10 @@
        * @return MediaTypeEntry that matches the lookup in the MEDIATYPE_TO_MIMETYPE table
        */
       public MediaType getMediaTypeForMimeType(String mimeTypeName)
  -    {
  +    {               
           //Find the MediaType by matching the Mimetype
           PersistenceStore store = getPersistenceStore();
  +        
           Filter filter = store.newFilter();        
           filter.addEqualTo("mimetypes.name", mimeTypeName);
           Object query = store.newQuery(mediaTypeClass, filter);        
  
  
  
  1.5       +2 -1      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/PortletDescriptorUtilities.java
  
  Index: PortletDescriptorUtilities.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/PortletDescriptorUtilities.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- PortletDescriptorUtilities.java	4 Feb 2004 21:33:12 -0000	1.4
  +++ PortletDescriptorUtilities.java	28 Feb 2004 20:05:50 -0000	1.5
  @@ -260,6 +260,7 @@
           }
           catch (Throwable t)
           {
  +            t.printStackTrace();
               String msg = "Could not unmarshal \"" + pathPortletXML+"\".  "+t.toString();
               log.error(msg, t);
               throw new PortletApplicationException(msg, t);
  
  
  

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