[seam-commits] Seam SVN: r10985 - in modules/trunk/security: src/main/java/org/jboss/seam/security/permission/action and 1 other directory.

[seam-commits at lists.jboss.org]

Author: dan.j.allen
Date: 2009-05-26 11:23:49 -0400 (Tue, 26 May 2009)
New Revision: 10985

Modified:
   modules/trunk/security/pom.xml
   modules/trunk/security/src/main/java/org/jboss/seam/security/permission/action/PermissionSearch.java
Log:
don't depend on faces module; add el dependency

Modified: modules/trunk/security/pom.xml
===================================================================
--- modules/trunk/security/pom.xml	2009-05-26 15:21:46 UTC (rev 10984)
+++ modules/trunk/security/pom.xml	2009-05-26 15:23:49 UTC (rev 10985)
@@ -47,6 +47,12 @@
       </dependency>
 
       <dependency>
+         <groupId>javax.el</groupId>
+         <artifactId>el-api</artifactId>
+         <scope>provided</scope>
+      </dependency>
+
+      <dependency>
          <groupId>org.drools</groupId>
          <artifactId>drools-core</artifactId>
       </dependency>
@@ -66,10 +72,12 @@
          <artifactId>seam-international</artifactId>
       </dependency>
 
+      <!--
       <dependency>
          <groupId>${seam.groupId}</groupId>
          <artifactId>seam-faces</artifactId>
       </dependency>
+      -->
       
       <dependency>
          <groupId>${seam.groupId}</groupId>

Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/permission/action/PermissionSearch.java
===================================================================
--- modules/trunk/security/src/main/java/org/jboss/seam/security/permission/action/PermissionSearch.java	2009-05-26 15:21:46 UTC (rev 10984)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/permission/action/PermissionSearch.java	2009-05-26 15:23:49 UTC (rev 10985)
@@ -12,8 +12,8 @@
 import javax.context.ConversationScoped;
 import javax.inject.Current;
 
-import org.jboss.seam.faces.annotations.DataModel;
-import org.jboss.seam.faces.annotations.DataModelSelection;
+//import org.jboss.seam.faces.annotations.DataModel;
+//import org.jboss.seam.faces.annotations.DataModelSelection;
 import org.jboss.seam.security.management.IdentityManager;
 import org.jboss.seam.security.permission.Permission;
 import org.jboss.seam.security.permission.PermissionManager;
@@ -27,10 +27,10 @@
    private Map<Principal,List<Permission>> groupedPermissions = new HashMap<Principal,List<Permission>>();
  
    
-   @DataModel(scope = ConversationScoped.class)
+   //@DataModel(scope = ConversationScoped.class)
    List<Principal> recipients;
    
-   @DataModelSelection
+   //@DataModelSelection
    Principal selectedRecipient;
    
    @Current IdentityManager identityManager;