ate         2005/01/27 17:39:07

  Modified:    portal/src/java/org/apache/jetspeed/util/descriptor
                        PortletApplicationWar.java
               portal/src/java/org/apache/jetspeed/tools/pamanager
                        FileSystemPAM.java
  Log:
  Removed logging FileNotFoundException to the console (Tomcat) when 
jetspeed-portlet.xml couldn't be found. Other exceptions are still logged.
  
  Revision  Changes    Path
  1.20      +8 -1      
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/util/descriptor/PortletApplicationWar.java
  
  Index: PortletApplicationWar.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/util/descriptor/PortletApplicationWar.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- PortletApplicationWar.java        17 Sep 2004 03:12:47 -0000      1.19
  +++ PortletApplicationWar.java        28 Jan 2005 01:39:07 -0000      1.20
  @@ -219,7 +219,14 @@
               }
               catch (IOException e)
               {
  -                log.info("Did not load extended metadata as it most likely 
does not exist.  " + e.toString());
  +                if ( e instanceof FileNotFoundException )
  +                {
  +                    log.info("No extended metadata found.");
  +                }
  +                else
  +                {
  +                    log.warn("Failed to load existing metadata: " + 
e.toString());
  +                }
               }
               catch (MetaDataException e)
               {
  
  
  
  1.46      +9 -2      
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/FileSystemPAM.java
  
  Index: FileSystemPAM.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/FileSystemPAM.java,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- FileSystemPAM.java        29 Oct 2004 14:19:38 -0000      1.45
  +++ FileSystemPAM.java        28 Jan 2005 01:39:07 -0000      1.46
  @@ -781,7 +781,14 @@
               }
               catch (Exception e)
               {
  -                log.info("Did not load extended metadata as it most likely 
does not exist.  " + e.toString());
  +                if ( e instanceof FileNotFoundException )
  +                {
  +                    log.info("No extended metadata found.");
  +                }
  +                else
  +                {
  +                    log.warn("Failed to load existing metadata: " + 
e.toString());
  +                }
               }
               finally
               {
  
  
  

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

Reply via email to