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

[Gavin King]

  User: gavin   
  Date: 06/11/10 14:07:00

  Modified:    src/main/org/jboss/seam/core    Events.java Exceptions.java
                        Pages.java
  Log:
  add DTDs for seam config files
  
  Revision  Changes    Path
  1.10      +2 -0      jboss-seam/src/main/org/jboss/seam/core/Events.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Events.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Events.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- Events.java	27 Oct 2006 21:32:34 -0000	1.9
  +++ Events.java	10 Nov 2006 19:07:00 -0000	1.10
  @@ -25,6 +25,7 @@
   import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.core.Expressions.MethodBinding;
   import org.jboss.seam.core.Init.ObserverMethod;
  +import org.jboss.seam.util.DTDEntityResolver;
   import org.jboss.seam.util.Resources;
   
   @Scope(ScopeType.APPLICATION)
  @@ -49,6 +50,7 @@
         {
            log.info("reading events.xml");
            SAXReader saxReader = new SAXReader();
  +         saxReader.setEntityResolver( new DTDEntityResolver() );
            saxReader.setMergeAdjacentText(true);
            Document doc = saxReader.read(stream);
            List<Element> elements = doc.getRootElement().elements("event");
  
  
  
  1.11      +21 -1     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.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- Exceptions.java	9 Nov 2006 18:45:28 -0000	1.10
  +++ Exceptions.java	10 Nov 2006 19:07:00 -0000	1.11
  @@ -27,6 +27,7 @@
   import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.contexts.Lifecycle;
   import org.jboss.seam.interceptors.ExceptionInterceptor;
  +import org.jboss.seam.util.DTDEntityResolver;
   import org.jboss.seam.util.Reflections;
   import org.jboss.seam.util.Resources;
   import org.jboss.seam.util.Strings;
  @@ -72,6 +73,7 @@
         {
            log.info("reading exceptions.xml");
            SAXReader saxReader = new SAXReader();
  +         saxReader.setEntityResolver( new DTDEntityResolver() );
            saxReader.setMergeAdjacentText(true);
            Document doc = saxReader.read(stream);
            List<Element> elements = doc.getRootElement().elements("exception");
  @@ -104,6 +106,7 @@
      private ExceptionHandler createHandler(Element exception, final Class clazz)
      {
         final boolean endConversation = exception.elementIterator("end-conversation").hasNext();
  +      final boolean rollback = exception.elementIterator("rollback").hasNext();
   
         Element render = exception.element("render");
         if (render!=null)
  @@ -133,6 +136,11 @@
               {
                  return endConversation;
               }
  +            @Override
  +            protected boolean isRollback(Exception e)
  +            {
  +               return rollback;
  +            }
            };
         }
         
  @@ -164,13 +172,20 @@
               {
                  return endConversation;
               }
  +            @Override
  +            protected boolean isRollback(Exception e)
  +            {
  +               return rollback;
  +            }
            };
         }
         
         Element error = exception.element("http-error");
         if (error!=null)
         {
  -         final int code = Integer.parseInt( error.attributeValue("errorCode") );
  +         String errorCode = error.attributeValue("error-code");
  +         final int code = Strings.isEmpty(errorCode) ? 
  +               500 : Integer.parseInt(errorCode);
            final String message = error.getTextTrim();
            return new ErrorHandler()
            {
  @@ -194,6 +209,11 @@
               {
                  return endConversation;
               }
  +            @Override
  +            protected boolean isRollback(Exception e)
  +            {
  +               return rollback;
  +            }
            };
         }
         
  
  
  
  1.45      +2 -1      jboss-seam/src/main/org/jboss/seam/core/Pages.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Pages.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Pages.java,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -b -r1.44 -r1.45
  --- Pages.java	9 Nov 2006 05:29:03 -0000	1.44
  +++ Pages.java	10 Nov 2006 19:07:00 -0000	1.45
  @@ -30,6 +30,7 @@
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.core.Expressions.MethodBinding;
  +import org.jboss.seam.util.DTDEntityResolver;
   import org.jboss.seam.util.Parameters;
   import org.jboss.seam.util.Resources;
   
  @@ -45,7 +46,6 @@
   @Name("org.jboss.seam.core.pages")
   public class Pages 
   {
  -   public static final String PAGE_PARAMETERS = "org.jboss.seam.core.pageParameters";
      
      private static final Log log = LogFactory.getLog(Pages.class);
      
  @@ -101,6 +101,7 @@
      {
         Document doc;
         SAXReader saxReader = new SAXReader();
  +      saxReader.setEntityResolver( new DTDEntityResolver() );
         saxReader.setMergeAdjacentText(true);
         try
         {