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

[Peter Muir]

  User: pmuir   
  Date: 07/10/01 10:58:40

  Modified:    src/main/org/jboss/seam/init  Initialization.java
  Log:
  JBSEAM-2013
  
  Revision  Changes    Path
  1.192     +13 -4     jboss-seam/src/main/org/jboss/seam/init/Initialization.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Initialization.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/init/Initialization.java,v
  retrieving revision 1.191
  retrieving revision 1.192
  diff -u -b -r1.191 -r1.192
  --- Initialization.java	22 Aug 2007 04:25:47 -0000	1.191
  +++ Initialization.java	1 Oct 2007 14:58:40 -0000	1.192
  @@ -276,12 +276,21 @@
         List<Element> actions = event.elements("action");
         for (Element action: actions)
         {
  +         String execute = action.attributeValue("execute");
  +         if (execute==null)
  +         {
            String actionExpression = action.attributeValue("expression");
  -         if (actionExpression==null)
  +            if (actionExpression!=null)
            {
  -            throw new IllegalArgumentException("must specify expression for <action/> declaration");
  +                log.warn("<action expression=\"" + actionExpression + "\" /> has been deprecated, use <action execute=\"" + actionExpression + "\" /> instead");
  +                execute = actionExpression;
  +            }
  +            else
  +            {    
  +                throw new IllegalArgumentException("must specify execute for <action/> declaration");
  +            }
            }
  -         eventListener.getListenerMethodBindings().add(actionExpression);
  +         eventListener.getListenerMethodBindings().add(execute);
         }
      }