Author: shane.bryzak(a)jboss.com Date: 2009-09-23 23:53:03 -0400 (Wed, 23 Sep 2009) New Revision: 11510 Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/Credentials.java modules/trunk/security/src/main/java/org/jboss/seam/security/Identity.java modules/trunk/security/src/main/java/org/jboss/seam/security/JpaTokenStore.java modules/trunk/security/src/main/java/org/jboss/seam/security/RememberMe.java modules/trunk/security/src/main/java/org/jboss/seam/security/Secure.java modules/trunk/security/src/main/java/org/jboss/seam/security/SecurityEventMessages.java modules/trunk/security/src/main/java/org/jboss/seam/security/SecurityInterceptor.java modules/trunk/security/src/main/java/org/jboss/seam/security/management/IdentityManager.java modules/trunk/security/src/main/java/org/jboss/seam/security/management/JpaIdentityStore.java modules/trunk/security/src/main/java/org/jboss/seam/security/management/JpaIdentityStoreConfig.java modules/trunk/security/src/main/java/org/jboss/seam/security/management/PasswordHash.java modules/trunk/security/src/main/java/org/jboss/seam/security/management/action/RoleAction.java modules/trunk/security/src/main/java/org/jboss/seam/security/management/action/RoleSearch.java modules/trunk/security/src/main/java/org/jboss/seam/security/management/action/UserAction.java modules/trunk/security/src/main/java/org/jboss/seam/security/management/action/UserSearch.java modules/trunk/security/src/main/java/org/jboss/seam/security/permission/EntityIdentifierStrategy.java modules/trunk/security/src/main/java/org/jboss/seam/security/permission/IdentifierPolicy.java modules/trunk/security/src/main/java/org/jboss/seam/security/permission/JpaPermissionStore.java modules/trunk/security/src/main/java/org/jboss/seam/security/permission/PermissionManager.java modules/trunk/security/src/main/java/org/jboss/seam/security/permission/PermissionMapper.java modules/trunk/security/src/main/java/org/jboss/seam/security/permission/PersistentPermissionResolver.java modules/trunk/security/src/main/java/org/jboss/seam/security/permission/RuleBasedPermissionResolver.java modules/trunk/security/src/main/java/org/jboss/seam/security/permission/action/PermissionSearch.java Log: fix compiler errors Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/Credentials.java =================================================================== --- modules/trunk/security/src/main/java/org/jboss/seam/security/Credentials.java 2009-09-23 18:51:07 UTC (rev 11509) +++ modules/trunk/security/src/main/java/org/jboss/seam/security/Credentials.java 2009-09-24 03:53:03 UTC (rev 11510) @@ -3,9 +3,9 @@ import java.io.Serializable; import javax.enterprise.context.SessionScoped; -import javax.enterprise.inject.Current; -import javax.enterprise.inject.Named; +import javax.enterprise.inject.Default; import javax.enterprise.inject.spi.BeanManager; +import javax.inject.Named; import org.jboss.seam.security.events.CredentialsInitializedEvent; import org.jboss.seam.security.events.CredentialsUpdatedEvent; @@ -16,7 +16,7 @@ { private static final long serialVersionUID = -2271248957776488426L; - @Current BeanManager manager; + @Default BeanManager manager; private String username; private String password; Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/Identity.java =================================================================== --- modules/trunk/security/src/main/java/org/jboss/seam/security/Identity.java 2009-09-23 18:51:07 UTC (rev 11509) +++ modules/trunk/security/src/main/java/org/jboss/seam/security/Identity.java 2009-09-24 03:53:03 UTC (rev 11510) @@ -12,9 +12,9 @@ import javax.el.ValueExpression; import javax.enterprise.context.SessionScoped; -import javax.enterprise.inject.Current; -import javax.enterprise.inject.Initializer; -import javax.enterprise.inject.Named; +import javax.enterprise.inject.Default; +import javax.inject.Inject; +import javax.inject.Named; import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.BeanManager; import javax.security.auth.Subject; @@ -63,10 +63,10 @@ @Logger Log log; - @Current private BeanManager manager; - @Current private Credentials credentials; - @Current private PermissionMapper permissionMapper; - @Current private Expressions expressions; + @Default private BeanManager manager; + @Default private Credentials credentials; + @Default private PermissionMapper permissionMapper; + @Default private Expressions expressions; private Principal principal; private Subject subject; @@ -80,7 +80,7 @@ */ private boolean authenticating = false; - @Initializer + @Inject public void create() { subject = new Subject(); Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/JpaTokenStore.java =================================================================== --- modules/trunk/security/src/main/java/org/jboss/seam/security/JpaTokenStore.java 2009-09-23 18:51:07 UTC (rev 11509) +++ modules/trunk/security/src/main/java/org/jboss/seam/security/JpaTokenStore.java 2009-09-24 03:53:03 UTC (rev 11510) @@ -3,8 +3,8 @@ import java.io.Serializable; import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Current; -import javax.enterprise.inject.Initializer; +import javax.enterprise.inject.Default; +import javax.inject.Inject; import javax.enterprise.inject.spi.BeanManager; import javax.persistence.EntityManager; import javax.persistence.NoResultException; @@ -31,9 +31,9 @@ private AnnotatedBeanProperty<TokenUsername> tokenUsernameProperty; private AnnotatedBeanProperty<TokenValue> tokenValueProperty; - @Current BeanManager manager; + @Default BeanManager manager; - @Initializer + @Inject public void create() { tokenUsernameProperty = new AnnotatedBeanProperty<TokenUsername>(tokenEntityClass, TokenUsername.class); Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/RememberMe.java =================================================================== --- modules/trunk/security/src/main/java/org/jboss/seam/security/RememberMe.java 2009-09-23 18:51:07 UTC (rev 11509) +++ modules/trunk/security/src/main/java/org/jboss/seam/security/RememberMe.java 2009-09-24 03:53:03 UTC (rev 11510) @@ -7,12 +7,11 @@ import java.util.Random; import javax.enterprise.context.SessionScoped; -import javax.enterprise.inject.Current; -import javax.enterprise.inject.Initializer; -import javax.enterprise.inject.Named; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; import javax.enterprise.event.Observes; +import javax.enterprise.inject.Default; +import javax.enterprise.inject.spi.BeanManager; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.beans.BeanManagerHelper; import org.jboss.seam.security.events.CredentialsInitializedEvent; @@ -41,10 +40,10 @@ public enum Mode { disabled, usernameOnly, autoLogin} - @Current BeanManager manager; - @Current Identity identity; - @Current Credentials credentials; - @Current IdentityManager identityManager; + @Default BeanManager manager; + @Default Identity identity; + @Default Credentials credentials; + @Default IdentityManager identityManager; private ManagedCookie usernameSelector; private ManagedCookie tokenSelector; @@ -64,7 +63,7 @@ public RememberMe() {} public - @Initializer + @Inject void create() { if (mode.equals(Mode.usernameOnly)) Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/Secure.java =================================================================== --- modules/trunk/security/src/main/java/org/jboss/seam/security/Secure.java 2009-09-23 18:51:07 UTC (rev 11509) +++ modules/trunk/security/src/main/java/org/jboss/seam/security/Secure.java 2009-09-24 03:53:03 UTC (rev 11510) @@ -8,15 +8,14 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBindingType; +import javax.interceptor.InterceptorBinding; - /** * * @author Shane Bryzak */ @Inherited -@InterceptorBindingType +@InterceptorBinding @Target({TYPE, METHOD}) @Retention(RUNTIME) public @interface Secure Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/SecurityEventMessages.java =================================================================== --- modules/trunk/security/src/main/java/org/jboss/seam/security/SecurityEventMessages.java 2009-09-23 18:51:07 UTC (rev 11509) +++ modules/trunk/security/src/main/java/org/jboss/seam/security/SecurityEventMessages.java 2009-09-24 03:53:03 UTC (rev 11510) @@ -1,7 +1,7 @@ package org.jboss.seam.security; import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Current; +import javax.enterprise.inject.Default; import javax.enterprise.event.Observes; import org.jboss.seam.international.StatusMessages; @@ -32,8 +32,8 @@ private static final String DEFAULT_ALREADY_LOGGED_IN_MESSAGE = "You're already logged in. Please log out first if you wish to log in again."; private static final String DEFAULT_NOT_LOGGED_IN_MESSAGE = "Please log in first."; - @Current StatusMessages statusMessages; - @Current Credentials credentials; + @Default StatusMessages statusMessages; + @Default Credentials credentials; public void postAuthenticate(@Observes PostAuthenticateEvent event) { Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/SecurityInterceptor.java =================================================================== --- modules/trunk/security/src/main/java/org/jboss/seam/security/SecurityInterceptor.java 2009-09-23 18:51:07 UTC (rev 11509) +++ modules/trunk/security/src/main/java/org/jboss/seam/security/SecurityInterceptor.java 2009-09-24 03:53:03 UTC (rev 11510) @@ -8,7 +8,7 @@ import java.util.Map; import java.util.Set; -import javax.enterprise.inject.Current; +import javax.enterprise.inject.Default; import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.BeanManager; import javax.interceptor.AroundInvoke; @@ -37,7 +37,7 @@ */ private transient volatile Map<Method,Restriction> restrictions = new HashMap<Method,Restriction>(); - @Current BeanManager manager; + @Default BeanManager manager; private class Restriction { Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/management/IdentityManager.java =================================================================== --- modules/trunk/security/src/main/java/org/jboss/seam/security/management/IdentityManager.java 2009-09-23 18:51:07 UTC (rev 11509) +++ modules/trunk/security/src/main/java/org/jboss/seam/security/management/IdentityManager.java 2009-09-24 03:53:03 UTC (rev 11510) @@ -7,9 +7,9 @@ import java.util.List; import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Current; -import javax.enterprise.inject.Initializer; -import javax.enterprise.inject.Named; +import javax.enterprise.inject.Default; +import javax.inject.Inject; +import javax.inject.Named; import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.BeanManager; @@ -40,13 +40,13 @@ @Logger Log log; - @Current BeanManager manager; - @Current Identity identity; + @Default BeanManager manager; + @Default Identity identity; private IdentityStore identityStore; private IdentityStore roleIdentityStore; - @Initializer + @Inject public void create() { initIdentityStore(); Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/management/JpaIdentityStore.java =================================================================== --- modules/trunk/security/src/main/java/org/jboss/seam/security/management/JpaIdentityStore.java 2009-09-23 18:51:07 UTC (rev 11509) +++ modules/trunk/security/src/main/java/org/jboss/seam/security/management/JpaIdentityStore.java 2009-09-24 03:53:03 UTC (rev 11510) @@ -12,8 +12,8 @@ import java.util.Set; import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Current; -import javax.enterprise.inject.Initializer; +import javax.enterprise.inject.Default; +import javax.inject.Inject; import javax.enterprise.inject.spi.BeanManager; import javax.persistence.EntityManager; import javax.persistence.NoResultException; @@ -64,8 +64,8 @@ return featureSet.supports(feature); } - @Initializer - public void init(@Current JpaIdentityStoreConfig config, @Current BeanManager manager) + @Inject + public void init(@Default JpaIdentityStoreConfig config, @Default BeanManager manager) { this.config = config; this.manager = manager; Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/management/JpaIdentityStoreConfig.java =================================================================== --- modules/trunk/security/src/main/java/org/jboss/seam/security/management/JpaIdentityStoreConfig.java 2009-09-23 18:51:07 UTC (rev 11509) +++ modules/trunk/security/src/main/java/org/jboss/seam/security/management/JpaIdentityStoreConfig.java 2009-09-24 03:53:03 UTC (rev 11510) @@ -5,7 +5,7 @@ import java.util.Collection; import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Initializer; +import javax.inject.Inject; import org.jboss.seam.security.annotations.management.PasswordSalt; import org.jboss.seam.security.annotations.management.RoleConditional; @@ -48,7 +48,7 @@ //@Current // FIXME temporarily disable!! IdentityStoreEntityClasses entityClasses; - @Initializer + @Inject public void initProperties() { userPrincipalProperty = new AnnotatedBeanProperty<UserPrincipal>(getUserEntityClass(), UserPrincipal.class); Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/management/PasswordHash.java =================================================================== --- modules/trunk/security/src/main/java/org/jboss/seam/security/management/PasswordHash.java 2009-09-23 18:51:07 UTC (rev 11509) +++ modules/trunk/security/src/main/java/org/jboss/seam/security/management/PasswordHash.java 2009-09-24 03:53:03 UTC (rev 11510) @@ -8,7 +8,7 @@ import javax.crypto.SecretKeyFactory; import javax.crypto.spec.PBEKeySpec; import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Named; +import javax.inject.Named; import org.jboss.seam.security.crypto.BinTools; import org.jboss.seam.security.crypto.PBKDF2; Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/management/action/RoleAction.java =================================================================== --- modules/trunk/security/src/main/java/org/jboss/seam/security/management/action/RoleAction.java 2009-09-23 18:51:07 UTC (rev 11509) +++ modules/trunk/security/src/main/java/org/jboss/seam/security/management/action/RoleAction.java 2009-09-24 03:53:03 UTC (rev 11510) @@ -6,8 +6,8 @@ import javax.enterprise.context.Conversation; import javax.enterprise.context.ConversationScoped; -import javax.enterprise.inject.Current; -import javax.enterprise.inject.Named; +import javax.enterprise.inject.Default; +import javax.inject.Named; import org.jboss.seam.security.management.IdentityManager; @@ -21,8 +21,8 @@ private String role; private List<String> groups; - @Current IdentityManager identityManager; - @Current Conversation conversation; + @Default IdentityManager identityManager; + @Default Conversation conversation; public void createRole() { Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/management/action/RoleSearch.java =================================================================== --- modules/trunk/security/src/main/java/org/jboss/seam/security/management/action/RoleSearch.java 2009-09-23 18:51:07 UTC (rev 11509) +++ modules/trunk/security/src/main/java/org/jboss/seam/security/management/action/RoleSearch.java 2009-09-24 03:53:03 UTC (rev 11510) @@ -3,7 +3,7 @@ import java.io.Serializable; import javax.enterprise.context.SessionScoped; -import javax.enterprise.inject.Named; +import javax.inject.Named; @Named @SessionScoped Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/management/action/UserAction.java =================================================================== --- modules/trunk/security/src/main/java/org/jboss/seam/security/management/action/UserAction.java 2009-09-23 18:51:07 UTC (rev 11509) +++ modules/trunk/security/src/main/java/org/jboss/seam/security/management/action/UserAction.java 2009-09-24 03:53:03 UTC (rev 11510) @@ -6,8 +6,8 @@ import javax.enterprise.context.Conversation; import javax.enterprise.context.ConversationScoped; -import javax.enterprise.inject.Current; -import javax.enterprise.inject.Named; +import javax.enterprise.inject.Default; +import javax.inject.Named; import org.jboss.seam.security.management.IdentityManager; @@ -30,8 +30,8 @@ private boolean newUserFlag; - @Current IdentityManager identityManager; - @Current Conversation conversation; + @Default IdentityManager identityManager; + @Default Conversation conversation; public void createUser() { Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/management/action/UserSearch.java =================================================================== --- modules/trunk/security/src/main/java/org/jboss/seam/security/management/action/UserSearch.java 2009-09-23 18:51:07 UTC (rev 11509) +++ modules/trunk/security/src/main/java/org/jboss/seam/security/management/action/UserSearch.java 2009-09-24 03:53:03 UTC (rev 11510) @@ -3,7 +3,7 @@ import java.io.Serializable; import javax.enterprise.context.SessionScoped; -import javax.enterprise.inject.Named; +import javax.inject.Named; @Named @SessionScoped Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/permission/EntityIdentifierStrategy.java =================================================================== --- modules/trunk/security/src/main/java/org/jboss/seam/security/permission/EntityIdentifierStrategy.java 2009-09-23 18:51:07 UTC (rev 11509) +++ modules/trunk/security/src/main/java/org/jboss/seam/security/permission/EntityIdentifierStrategy.java 2009-09-24 03:53:03 UTC (rev 11510) @@ -3,7 +3,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import javax.enterprise.inject.Current; +import javax.enterprise.inject.Default; import javax.enterprise.inject.spi.BeanManager; import javax.persistence.Entity; import javax.persistence.EntityManager; @@ -23,8 +23,8 @@ private Map<Class,String> identifierNames = new ConcurrentHashMap<Class,String>(); //@Current PersistenceProvider persistenceProvider; - @Current Expressions expressions; - @Current BeanManager manager; + @Default Expressions expressions; + @Default BeanManager manager; public boolean canIdentify(Class targetClass) { Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/permission/IdentifierPolicy.java =================================================================== --- modules/trunk/security/src/main/java/org/jboss/seam/security/permission/IdentifierPolicy.java 2009-09-23 18:51:07 UTC (rev 11509) +++ modules/trunk/security/src/main/java/org/jboss/seam/security/permission/IdentifierPolicy.java 2009-09-24 03:53:03 UTC (rev 11510) @@ -6,7 +6,7 @@ import java.util.concurrent.ConcurrentHashMap; import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Initializer; +import javax.inject.Inject; import org.jboss.seam.security.annotations.permission.Identifier; @@ -24,7 +24,7 @@ private Set<IdentifierStrategy> registeredStrategies = new HashSet<IdentifierStrategy>(); - @Initializer + @Inject public void create() { if (registeredStrategies.isEmpty()) Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/permission/JpaPermissionStore.java =================================================================== --- modules/trunk/security/src/main/java/org/jboss/seam/security/permission/JpaPermissionStore.java 2009-09-23 18:51:07 UTC (rev 11509) +++ modules/trunk/security/src/main/java/org/jboss/seam/security/permission/JpaPermissionStore.java 2009-09-24 03:53:03 UTC (rev 11510) @@ -10,8 +10,8 @@ import java.util.Set; import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Current; -import javax.enterprise.inject.Initializer; +import javax.enterprise.inject.Default; +import javax.inject.Inject; import javax.enterprise.inject.spi.BeanManager; import javax.persistence.EntityManager; import javax.persistence.Query; @@ -63,11 +63,11 @@ private PermissionMetadata metadata; - @Current IdentifierPolicy identifierPolicy; - @Current BeanManager manager; - @Current IdentityManager identityManager; + @Default IdentifierPolicy identifierPolicy; + @Default BeanManager manager; + @Default IdentityManager identityManager; - @Initializer + @Inject public void init() { metadata = new PermissionMetadata(); Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/permission/PermissionManager.java =================================================================== --- modules/trunk/security/src/main/java/org/jboss/seam/security/permission/PermissionManager.java 2009-09-23 18:51:07 UTC (rev 11509) +++ modules/trunk/security/src/main/java/org/jboss/seam/security/permission/PermissionManager.java 2009-09-24 03:53:03 UTC (rev 11510) @@ -3,8 +3,8 @@ import java.io.Serializable; import java.util.List; -import javax.enterprise.inject.Current; -import javax.enterprise.inject.Named; +import javax.enterprise.inject.Default; +import javax.inject.Named; import org.jboss.seam.security.Identity; import org.jboss.webbeans.log.Log; @@ -27,8 +27,8 @@ @Logger Log log; - @Current PermissionStore permissionStore; - @Current Identity identity; + @Default PermissionStore permissionStore; + @Default Identity identity; public PermissionStore getPermissionStore() { Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/permission/PermissionMapper.java =================================================================== --- modules/trunk/security/src/main/java/org/jboss/seam/security/permission/PermissionMapper.java 2009-09-23 18:51:07 UTC (rev 11509) +++ modules/trunk/security/src/main/java/org/jboss/seam/security/permission/PermissionMapper.java 2009-09-24 03:53:03 UTC (rev 11510) @@ -8,7 +8,7 @@ import java.util.Set; import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Current; +import javax.enterprise.inject.Default; import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.BeanManager; @@ -31,7 +31,7 @@ private static final String DEFAULT_RESOLVER_CHAIN = "org.jboss.seam.security.defaultResolverChain"; - @Current BeanManager manager; + @Default BeanManager manager; private ResolverChain getResolverChain(Object target, String action) { Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/permission/PersistentPermissionResolver.java =================================================================== --- modules/trunk/security/src/main/java/org/jboss/seam/security/permission/PersistentPermissionResolver.java 2009-09-23 18:51:07 UTC (rev 11509) +++ modules/trunk/security/src/main/java/org/jboss/seam/security/permission/PersistentPermissionResolver.java 2009-09-24 03:53:03 UTC (rev 11510) @@ -5,8 +5,8 @@ import java.util.List; import java.util.Set; -import javax.enterprise.inject.Current; -import javax.enterprise.inject.Initializer; +import javax.enterprise.inject.Default; +import javax.inject.Inject; import javax.enterprise.inject.spi.BeanManager; import org.jboss.seam.beans.BeanManagerHelper; @@ -30,11 +30,11 @@ @Logger Log log; - @Current BeanManager manager; - @Current Identity identity; - @Current RuleBasedPermissionResolver ruleBasedPermissionResolver; + @Default BeanManager manager; + @Default Identity identity; + @Default RuleBasedPermissionResolver ruleBasedPermissionResolver; - @Initializer + @Inject public void initPermissionStore() { if (permissionStore == null) Modified: modules/trunk/security/src/main/java/org/jboss/seam/security/permission/RuleBasedPermissionResolver.java =================================================================== --- modules/trunk/security/src/main/java/org/jboss/seam/security/permission/RuleBasedPermissionResolver.java 2009-09-23 18:51:07 UTC (rev 11509) +++ modules/trunk/security/src/main/java/org/jboss/seam/security/permission/RuleBasedPermissionResolver.java 2009-09-24 03:53:03 UTC (rev 11510) @@ -10,8 +10,8 @@ import java.util.Set; import javax.enterprise.context.SessionScoped; -import javax.enterprise.inject.Current; -import javax.enterprise.inject.Initializer; +import javax.enterprise.inject.Default; +import javax.inject.Inject; import javax.enterprise.inject.spi.BeanManager; import javax.enterprise.event.Observes; @@ -43,10 +43,10 @@ private RuleBase securityRules; - @Current BeanManager manager; - @Current Identity identity; + @Default BeanManager manager; + @Default Identity identity; - @Initializer + @Inject public boolean create() { initSecurityContext(); 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-09-23 18:51:07 UTC (rev 11509) +++ modules/trunk/security/src/main/java/org/jboss/seam/security/permission/action/PermissionSearch.java 2009-09-24 03:53:03 UTC (rev 11510) @@ -9,8 +9,8 @@ import javax.enterprise.context.Conversation; import javax.enterprise.context.ConversationScoped; -import javax.enterprise.inject.Current; -import javax.enterprise.inject.Named; +import javax.enterprise.inject.Default; +import javax.inject.Named; import org.jboss.seam.security.management.IdentityManager; import org.jboss.seam.security.permission.Permission; @@ -31,12 +31,10 @@ //@DataModelSelection Principal selectedRecipient; - @Current IdentityManager identityManager; + @Default IdentityManager identityManager; + @Default PermissionManager permissionManager; + @Default Conversation conversation; - @Current PermissionManager permissionManager; - - @Current Conversation conversation; - private Object target; public void search(Object target)