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

[Shane Bryzak]

  User: sbryzak2
  Date: 07/01/13 00:36:06

  Modified:    src/main/org/jboss/seam/security  
                        AuthorizationException.java
                        SeamSecurityManager.java
  Log:
  simple support for Seam EL functions with the unified EL
  
  Revision  Changes    Path
  1.2       +1 -1      jboss-seam/src/main/org/jboss/seam/security/AuthorizationException.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AuthorizationException.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/security/AuthorizationException.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- AuthorizationException.java	12 Jan 2007 05:35:11 -0000	1.1
  +++ AuthorizationException.java	13 Jan 2007 05:36:06 -0000	1.2
  @@ -8,7 +8,7 @@
    * @author Shane Bryzak
    */
   @ApplicationException
  -public class AuthorizationException extends Exception
  +public class AuthorizationException extends RuntimeException
   {
     public AuthorizationException()
     {
  
  
  
  1.39      +8 -10     jboss-seam/src/main/org/jboss/seam/security/SeamSecurityManager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SeamSecurityManager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/security/SeamSecurityManager.java,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -b -r1.38 -r1.39
  --- SeamSecurityManager.java	12 Jan 2007 13:25:49 -0000	1.38
  +++ SeamSecurityManager.java	13 Jan 2007 05:36:06 -0000	1.39
  @@ -42,7 +42,6 @@
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.annotations.Startup;
   import org.jboss.seam.contexts.Contexts;
  -import org.jboss.seam.core.Expressions;
   import org.jboss.seam.log.LogProvider;
   import org.jboss.seam.log.Logging;
   import org.jboss.seam.security.config.SecurityConfiguration;
  @@ -128,11 +127,7 @@
       */
      public boolean evaluateExpression(String expr) throws AuthorizationException
      {
  -      // TODO it seems that neither of the following two methods work with EL Functions
  -      
         return (Boolean) new UnifiedELValueBinding(expr).getValue(FacesContext.getCurrentInstance());
  -      //return ((Boolean) Expressions.instance().createValueBinding(expr)
  -            //.getValue());
      }
   
      /**
  @@ -172,11 +167,14 @@
         WorkingMemory wm = mgr.getWorkingMemoryForSession();
         handles.add(wm.assertObject(check));
   
  +      if (args != null)
  +      {
         for (Object o : args)
         {
            if (o != null)
              handles.add(wm.assertObject(o));
         }
  +      }      
   
         wm.fireAllRules();