[jboss-cvs] jboss-seam/src/main/org/jboss/seam/core ...

[Gavin King]

  User: gavin   
  Date: 07/02/02 02:44:31

  Modified:    src/main/org/jboss/seam/core  Exceptions.java
  Log:
  support exception handling in pages.xml
  
  Revision  Changes    Path
  1.23      +3 -6      jboss-seam/src/main/org/jboss/seam/core/Exceptions.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Exceptions.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Exceptions.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -b -r1.22 -r1.23
  --- Exceptions.java	2 Feb 2007 07:06:22 -0000	1.22
  +++ Exceptions.java	2 Feb 2007 07:44:31 -0000	1.23
  @@ -78,13 +78,10 @@
      @Create
      public void initialize() throws Exception 
      {
  -      InputStream stream = Resources.getResourceAsStream("/WEB-INF/exceptions.xml");
  +      InputStream stream = Resources.getResourceAsStream("/WEB-INF/exceptions.xml"); //deprecated
  +      if (stream==null) stream = Resources.getResourceAsStream("/WEB-INF/pages.xml");
         ExceptionHandler anyhandler = null;
  -      if (stream==null)
  -      {
  -         log.info("no exceptions.xml file found");
  -      }
  -      else
  +      if (stream!=null)
         {
            log.info("reading exceptions.xml");
            List<Element> elements = XML.getRootElement(stream).elements("exception");