[seam-commits] Seam SVN: r11530 - in modules/trunk: faces/src/main/java/org/jboss/seam/faces and 11 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Thu Oct 1 20:21:26 EDT 2009
Author: shane.bryzak at jboss.com
Date: 2009-10-01 20:21:26 -0400 (Thu, 01 Oct 2009)
New Revision: 11530
Modified:
modules/trunk/drools/src/main/java/org/jboss/seam/drools/ManagedWorkingMemory.java
modules/trunk/drools/src/main/java/org/jboss/seam/drools/RuleAgent.java
modules/trunk/drools/src/main/java/org/jboss/seam/drools/RuleBase.java
modules/trunk/faces/src/main/java/org/jboss/seam/faces/Validation.java
modules/trunk/faces/src/main/java/org/jboss/seam/faces/databinding/DataModelBinder.java
modules/trunk/faces/src/main/java/org/jboss/seam/faces/el/FacesExpressions.java
modules/trunk/faces/src/main/java/org/jboss/seam/faces/international/FacesLocaleResolver.java
modules/trunk/faces/src/main/java/org/jboss/seam/faces/lifecycle/EnforceViewRestrictionsProcessor.java
modules/trunk/faces/src/main/java/org/jboss/seam/faces/lifecycle/ExecuteViewActionsListener.java
modules/trunk/faces/src/main/java/org/jboss/seam/faces/resources/FacesResourceLoader.java
modules/trunk/international/src/main/java/org/jboss/seam/international/Interpolator.java
modules/trunk/international/src/main/java/org/jboss/seam/international/LocaleProducer.java
modules/trunk/international/src/main/java/org/jboss/seam/international/StatusMessages.java
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/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/action/RoleAction.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/permission/EntityIdentifierStrategy.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:
use @Inject for DI
Modified: modules/trunk/drools/src/main/java/org/jboss/seam/drools/ManagedWorkingMemory.java
===================================================================
--- modules/trunk/drools/src/main/java/org/jboss/seam/drools/ManagedWorkingMemory.java 2009-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/drools/src/main/java/org/jboss/seam/drools/ManagedWorkingMemory.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -5,7 +5,7 @@
import javax.annotation.PreDestroy;
import javax.enterprise.context.ConversationScoped;
-import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
@@ -32,7 +32,7 @@
private StatefulSession statefulSession;
private ValueExpression<RuleBase> ruleBase;
- @Default BeanManager manager;
+ @Inject BeanManager manager;
public boolean clearDirty()
{
Modified: modules/trunk/drools/src/main/java/org/jboss/seam/drools/RuleAgent.java
===================================================================
--- modules/trunk/drools/src/main/java/org/jboss/seam/drools/RuleAgent.java 2009-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/drools/src/main/java/org/jboss/seam/drools/RuleAgent.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -5,9 +5,8 @@
import java.util.Properties;
import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.Produces;
import javax.inject.Inject;
+import javax.enterprise.inject.Produces;
import org.jboss.seam.resources.ResourceLoader;
import org.jboss.webbeans.log.Log;
@@ -21,7 +20,7 @@
{
@Logger Log log;
- @Default ResourceLoader resourceLoader;
+ @Inject ResourceLoader resourceLoader;
private org.drools.agent.RuleAgent agent;
private String configurationFile;
Modified: modules/trunk/drools/src/main/java/org/jboss/seam/drools/RuleBase.java
===================================================================
--- modules/trunk/drools/src/main/java/org/jboss/seam/drools/RuleBase.java 2009-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/drools/src/main/java/org/jboss/seam/drools/RuleBase.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -5,9 +5,8 @@
import java.io.Reader;
import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.Produces;
import javax.inject.Inject;
+import javax.enterprise.inject.Produces;
import org.drools.RuleBaseFactory;
import org.drools.compiler.DroolsError;
@@ -29,7 +28,7 @@
{
@Logger Log log;
- @Default ResourceLoader resourceLoader;
+ @Inject ResourceLoader resourceLoader;
private String[] ruleFiles;
private String dslFile;
Modified: modules/trunk/faces/src/main/java/org/jboss/seam/faces/Validation.java
===================================================================
--- modules/trunk/faces/src/main/java/org/jboss/seam/faces/Validation.java 2009-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/faces/src/main/java/org/jboss/seam/faces/Validation.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -1,6 +1,6 @@
package org.jboss.seam.faces;
-import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.inject.Named;
import javax.enterprise.inject.spi.BeanManager;
import javax.faces.context.FacesContext;
@@ -22,7 +22,7 @@
private boolean succeeded;
private boolean failed;
- @Default BeanManager manager;
+ @Inject BeanManager manager;
public void afterProcessValidations(FacesContext facesContext)
{
Modified: modules/trunk/faces/src/main/java/org/jboss/seam/faces/databinding/DataModelBinder.java
===================================================================
--- modules/trunk/faces/src/main/java/org/jboss/seam/faces/databinding/DataModelBinder.java 2009-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/faces/src/main/java/org/jboss/seam/faces/databinding/DataModelBinder.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -3,7 +3,7 @@
import java.lang.annotation.Annotation;
import java.util.Map;
-import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import org.jboss.seam.faces.DataModels;
import org.jboss.seam.faces.annotations.DataModel;
@@ -15,7 +15,7 @@
*/
public class DataModelBinder implements DataBinder<DataModel, Object, javax.faces.model.DataModel>
{
- @Default DataModels dataModels;
+ @Inject DataModels dataModels;
public String getVariableName(DataModel out)
{
Modified: modules/trunk/faces/src/main/java/org/jboss/seam/faces/el/FacesExpressions.java
===================================================================
--- modules/trunk/faces/src/main/java/org/jboss/seam/faces/el/FacesExpressions.java 2009-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/faces/src/main/java/org/jboss/seam/faces/el/FacesExpressions.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -2,7 +2,7 @@
package org.jboss.seam.faces.el;
import javax.el.ELContext;
-import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.faces.context.FacesContext;
import org.jboss.seam.beans.RuntimeSelected;
@@ -19,7 +19,7 @@
@RuntimeSelected
class FacesExpressions extends Expressions implements RuntimeSelectedBean
{
- @Default FacesContext facesContext;
+ @Inject FacesContext facesContext;
public boolean isActive()
{
Modified: modules/trunk/faces/src/main/java/org/jboss/seam/faces/international/FacesLocaleResolver.java
===================================================================
--- modules/trunk/faces/src/main/java/org/jboss/seam/faces/international/FacesLocaleResolver.java 2009-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/faces/src/main/java/org/jboss/seam/faces/international/FacesLocaleResolver.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -2,7 +2,7 @@
import java.util.Locale;
-import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.faces.context.FacesContext;
import org.jboss.seam.beans.RuntimeSelected;
@@ -21,7 +21,7 @@
@RuntimeSelected
class FacesLocaleResolver extends LocaleResolver implements RuntimeSelectedBean
{
- @Default FacesContext facesContext;
+ @Inject FacesContext facesContext;
public boolean isActive()
{
Modified: modules/trunk/faces/src/main/java/org/jboss/seam/faces/lifecycle/EnforceViewRestrictionsProcessor.java
===================================================================
--- modules/trunk/faces/src/main/java/org/jboss/seam/faces/lifecycle/EnforceViewRestrictionsProcessor.java 2009-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/faces/src/main/java/org/jboss/seam/faces/lifecycle/EnforceViewRestrictionsProcessor.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -3,7 +3,7 @@
import java.lang.reflect.InvocationTargetException;
import java.util.Collection;
-import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.faces.component.UIComponent;
import javax.faces.component.UIViewRoot;
import javax.faces.context.FacesContext;
@@ -42,8 +42,8 @@
{
@Logger Log log;
- @Default FacesContext facesContext;
- @Default Identity identity;
+ @Inject FacesContext facesContext;
+ @Inject Identity identity;
@Override
public boolean execute()
Modified: modules/trunk/faces/src/main/java/org/jboss/seam/faces/lifecycle/ExecuteViewActionsListener.java
===================================================================
--- modules/trunk/faces/src/main/java/org/jboss/seam/faces/lifecycle/ExecuteViewActionsListener.java 2009-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/faces/src/main/java/org/jboss/seam/faces/lifecycle/ExecuteViewActionsListener.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -4,7 +4,7 @@
import javax.el.ELException;
import javax.el.MethodExpression;
-import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.faces.FacesException;
import javax.faces.application.NavigationHandler;
import javax.faces.component.UIComponent;
@@ -47,7 +47,7 @@
@Logger Log log;
- @Default FacesContext facesContext;
+ @Inject FacesContext facesContext;
@Override
public boolean execute()
Modified: modules/trunk/faces/src/main/java/org/jboss/seam/faces/resources/FacesResourceLoader.java
===================================================================
--- modules/trunk/faces/src/main/java/org/jboss/seam/faces/resources/FacesResourceLoader.java 2009-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/faces/src/main/java/org/jboss/seam/faces/resources/FacesResourceLoader.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -6,7 +6,7 @@
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.faces.context.FacesContext;
import org.jboss.seam.beans.RuntimeSelected;
@@ -26,8 +26,8 @@
class FacesResourceLoader extends DefaultResourceLoader implements RuntimeSelectedBean
{
@Logger Log log;
- @Default FacesContext facesContext;
- @Default Locale locale;
+ @Inject FacesContext facesContext;
+ @Inject Locale locale;
public boolean isActive()
{
Modified: modules/trunk/international/src/main/java/org/jboss/seam/international/Interpolator.java
===================================================================
--- modules/trunk/international/src/main/java/org/jboss/seam/international/Interpolator.java 2009-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/international/src/main/java/org/jboss/seam/international/Interpolator.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -5,7 +5,6 @@
import java.util.Locale;
import java.util.StringTokenizer;
-import javax.enterprise.inject.Default;
import javax.inject.Inject;
import org.jboss.seam.el.Expressions;
@@ -26,7 +25,7 @@
public Interpolator() {}
- public @Inject Interpolator(Expressions expressions, @Default Locale locale)
+ public @Inject Interpolator(Expressions expressions, Locale locale)
{
this.expressions = expressions;
this.locale = locale;
Modified: modules/trunk/international/src/main/java/org/jboss/seam/international/LocaleProducer.java
===================================================================
--- modules/trunk/international/src/main/java/org/jboss/seam/international/LocaleProducer.java 2009-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/international/src/main/java/org/jboss/seam/international/LocaleProducer.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -2,7 +2,7 @@
import java.util.Locale;
-import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.enterprise.inject.Produces;
import javax.inject.Named;
Modified: modules/trunk/international/src/main/java/org/jboss/seam/international/StatusMessages.java
===================================================================
--- modules/trunk/international/src/main/java/org/jboss/seam/international/StatusMessages.java 2009-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/international/src/main/java/org/jboss/seam/international/StatusMessages.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -36,7 +36,6 @@
import javax.enterprise.context.ConversationScoped;
import javax.enterprise.inject.AnnotationLiteral;
-import javax.enterprise.inject.Default;
import javax.inject.Inject;
import javax.inject.Named;
import javax.enterprise.inject.spi.BeanManager;
@@ -88,7 +87,7 @@
// FIXME the scoping may not be right unless resourceBundle updates internal (for instance per request)
//private ResourceBundle resourceBundle;
- @Default BeanManager manager;
+ @Inject BeanManager manager;
public StatusMessages() {}
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-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/Credentials.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -3,8 +3,8 @@
import java.io.Serializable;
import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Default;
import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
import javax.inject.Named;
import org.jboss.seam.security.events.CredentialsInitializedEvent;
@@ -16,7 +16,7 @@
{
private static final long serialVersionUID = -2271248957776488426L;
- @Default BeanManager manager;
+ @Inject 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-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/Identity.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -12,7 +12,6 @@
import javax.el.ValueExpression;
import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Default;
import javax.inject.Inject;
import javax.inject.Named;
import javax.enterprise.inject.spi.Bean;
@@ -63,10 +62,10 @@
@Logger Log log;
- @Default private BeanManager manager;
- @Default private Credentials credentials;
- @Default private PermissionMapper permissionMapper;
- @Default private Expressions expressions;
+ @Inject private BeanManager manager;
+ @Inject private Credentials credentials;
+ @Inject private PermissionMapper permissionMapper;
+ @Inject private Expressions expressions;
private Principal principal;
private Subject 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-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/JpaTokenStore.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -3,7 +3,6 @@
import java.io.Serializable;
import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Default;
import javax.inject.Inject;
import javax.enterprise.inject.spi.BeanManager;
import javax.persistence.EntityManager;
@@ -31,7 +30,7 @@
private AnnotatedBeanProperty<TokenUsername> tokenUsernameProperty;
private AnnotatedBeanProperty<TokenValue> tokenValueProperty;
- @Default BeanManager manager;
+ @Inject BeanManager manager;
@Inject
public void create()
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-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/RememberMe.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -8,9 +8,8 @@
import javax.enterprise.context.SessionScoped;
import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.spi.BeanManager;
import javax.inject.Inject;
+import javax.enterprise.inject.spi.BeanManager;
import javax.inject.Named;
import org.jboss.seam.beans.BeanManagerHelper;
@@ -40,10 +39,10 @@
public enum Mode { disabled, usernameOnly, autoLogin}
- @Default BeanManager manager;
- @Default Identity identity;
- @Default Credentials credentials;
- @Default IdentityManager identityManager;
+ @Inject BeanManager manager;
+ @Inject Identity identity;
+ @Inject Credentials credentials;
+ @Inject IdentityManager identityManager;
private ManagedCookie usernameSelector;
private ManagedCookie tokenSelector;
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-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/SecurityEventMessages.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -1,7 +1,7 @@
package org.jboss.seam.security;
import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Default;
+import javax.inject.Inject;
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.";
- @Default StatusMessages statusMessages;
- @Default Credentials credentials;
+ @Inject StatusMessages statusMessages;
+ @Inject 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-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/SecurityInterceptor.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -8,7 +8,7 @@
import java.util.Map;
import java.util.Set;
-import javax.enterprise.inject.Default;
+import javax.inject.Inject;
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>();
- @Default BeanManager manager;
+ @Inject 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-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/management/IdentityManager.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -7,7 +7,6 @@
import java.util.List;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Default;
import javax.inject.Inject;
import javax.inject.Named;
import javax.enterprise.inject.spi.Bean;
@@ -40,8 +39,8 @@
@Logger Log log;
- @Default BeanManager manager;
- @Default Identity identity;
+ @Inject BeanManager manager;
+ @Inject Identity identity;
private IdentityStore identityStore;
private IdentityStore roleIdentityStore;
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-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/management/JpaIdentityStore.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -12,7 +12,6 @@
import java.util.Set;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Default;
import javax.inject.Inject;
import javax.enterprise.inject.spi.BeanManager;
import javax.persistence.EntityManager;
@@ -65,7 +64,7 @@
}
@Inject
- public void init(@Default JpaIdentityStoreConfig config, @Default BeanManager manager)
+ public void init(JpaIdentityStoreConfig config, BeanManager manager)
{
this.config = config;
this.manager = manager;
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-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/management/action/RoleAction.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -6,7 +6,7 @@
import javax.enterprise.context.Conversation;
import javax.enterprise.context.ConversationScoped;
-import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.inject.Named;
import org.jboss.seam.security.management.IdentityManager;
@@ -21,8 +21,8 @@
private String role;
private List<String> groups;
- @Default IdentityManager identityManager;
- @Default Conversation conversation;
+ @Inject IdentityManager identityManager;
+ @Inject Conversation conversation;
public void createRole()
{
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-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/management/action/UserAction.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -6,7 +6,7 @@
import javax.enterprise.context.Conversation;
import javax.enterprise.context.ConversationScoped;
-import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.inject.Named;
import org.jboss.seam.security.management.IdentityManager;
@@ -30,8 +30,8 @@
private boolean newUserFlag;
- @Default IdentityManager identityManager;
- @Default Conversation conversation;
+ @Inject IdentityManager identityManager;
+ @Inject Conversation conversation;
public void createUser()
{
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-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/permission/EntityIdentifierStrategy.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -3,7 +3,7 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.enterprise.inject.spi.BeanManager;
import javax.persistence.Entity;
import javax.persistence.EntityManager;
@@ -22,9 +22,9 @@
{
private Map<Class,String> identifierNames = new ConcurrentHashMap<Class,String>();
- //@Current PersistenceProvider persistenceProvider;
- @Default Expressions expressions;
- @Default BeanManager manager;
+ //@Inject PersistenceProvider persistenceProvider;
+ @Inject Expressions expressions;
+ @Inject BeanManager manager;
public boolean canIdentify(Class targetClass)
{
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-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/permission/JpaPermissionStore.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -10,7 +10,6 @@
import java.util.Set;
import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Default;
import javax.inject.Inject;
import javax.enterprise.inject.spi.BeanManager;
import javax.persistence.EntityManager;
@@ -63,9 +62,9 @@
private PermissionMetadata metadata;
- @Default IdentifierPolicy identifierPolicy;
- @Default BeanManager manager;
- @Default IdentityManager identityManager;
+ @Inject IdentifierPolicy identifierPolicy;
+ @Inject BeanManager manager;
+ @Inject IdentityManager identityManager;
@Inject
public void init()
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-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/permission/PermissionManager.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -3,7 +3,7 @@
import java.io.Serializable;
import java.util.List;
-import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.inject.Named;
import org.jboss.seam.security.Identity;
@@ -27,8 +27,8 @@
@Logger Log log;
- @Default PermissionStore permissionStore;
- @Default Identity identity;
+ @Inject PermissionStore permissionStore;
+ @Inject 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-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/permission/PermissionMapper.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -8,7 +8,7 @@
import java.util.Set;
import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Default;
+import javax.inject.Inject;
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";
- @Default BeanManager manager;
+ @Inject 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-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/permission/PersistentPermissionResolver.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -5,7 +5,6 @@
import java.util.List;
import java.util.Set;
-import javax.enterprise.inject.Default;
import javax.inject.Inject;
import javax.enterprise.inject.spi.BeanManager;
@@ -30,9 +29,9 @@
@Logger Log log;
- @Default BeanManager manager;
- @Default Identity identity;
- @Default RuleBasedPermissionResolver ruleBasedPermissionResolver;
+ @Inject BeanManager manager;
+ @Inject Identity identity;
+ @Inject RuleBasedPermissionResolver ruleBasedPermissionResolver;
@Inject
public void initPermissionStore()
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-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/permission/RuleBasedPermissionResolver.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -10,7 +10,6 @@
import java.util.Set;
import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Default;
import javax.inject.Inject;
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.event.Observes;
@@ -43,8 +42,8 @@
private RuleBase securityRules;
- @Default BeanManager manager;
- @Default Identity identity;
+ @Inject BeanManager manager;
+ @Inject Identity identity;
@Inject
public boolean create()
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-10-01 23:49:42 UTC (rev 11529)
+++ modules/trunk/security/src/main/java/org/jboss/seam/security/permission/action/PermissionSearch.java 2009-10-02 00:21:26 UTC (rev 11530)
@@ -9,7 +9,7 @@
import javax.enterprise.context.Conversation;
import javax.enterprise.context.ConversationScoped;
-import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.inject.Named;
import org.jboss.seam.security.management.IdentityManager;
@@ -31,9 +31,9 @@
//@DataModelSelection
Principal selectedRecipient;
- @Default IdentityManager identityManager;
- @Default PermissionManager permissionManager;
- @Default Conversation conversation;
+ @Inject IdentityManager identityManager;
+ @Inject PermissionManager permissionManager;
+ @Inject Conversation conversation;
private Object target;
More information about the seam-commits
mailing list