removendo overridecomponent que não funcionava direito

src/main/java/br/com/caelum/brutal/auth/Access.java

@@ -4,8 +4,7 @@
 import java.util.List;
 
 import javax.annotation.PostConstruct;
-import javax.annotation.Priority;
-import javax.enterprise.inject.Alternative;
+import javax.enterprise.context.RequestScoped;
 import javax.enterprise.inject.Produces;
 import javax.inject.Inject;
 import javax.servlet.http.Cookie;
@@ -17,6 +16,7 @@
 import br.com.caelum.brutal.model.User;
 import br.com.caelum.brutal.model.UserSession;
 
+@RequestScoped
 public class Access {
 
 	public static final String BRUTAL_SESSION = "brutal_session";
@@ -50,6 +50,7 @@ public User login(User user) {
 		return user;
 	}
 
+	@RequestScoped
 	@Produces
 	public User getInstance() {
 		User user = userAndSession == null ? null : userAndSession.getUser();

src/main/java/br/com/caelum/brutal/infra/BrutalMultipartInterceptor.java

@@ -1,6 +1,9 @@
 package br.com.caelum.brutal.infra;
 
+import javax.annotation.Priority;
+import javax.enterprise.inject.Alternative;
 import javax.inject.Inject;
+import javax.interceptor.Interceptor;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.log4j.Logger;
@@ -9,7 +12,6 @@
 import br.com.caelum.vraptor4.Intercepts;
 import br.com.caelum.vraptor4.Validator;
 import br.com.caelum.vraptor4.core.InterceptorStack;
-import br.com.caelum.vraptor4.core.OverrideComponent;
 import br.com.caelum.vraptor4.http.MutableRequest;
 import br.com.caelum.vraptor4.interceptor.ControllerLookupInterceptor;
 import br.com.caelum.vraptor4.interceptor.multipart.CommonsUploadMultipartInterceptor;
@@ -18,7 +20,8 @@
 import br.com.caelum.vraptor4.restfulie.controller.ControllerMethod;
 
 @Intercepts(before = ControllerLookupInterceptor.class, after = {})
-@OverrideComponent
+@Alternative
+@Priority(Interceptor.Priority.APPLICATION)
 public class BrutalMultipartInterceptor extends CommonsUploadMultipartInterceptor {
 
     private static final Logger LOG = Logger.getLogger(BrutalMultipartInterceptor.class);

src/main/java/br/com/caelum/brutal/infra/BrutalResourceNotFoundHandler.java

@@ -2,18 +2,21 @@
 
 import java.io.IOException;
 
+import javax.annotation.Priority;
+import javax.enterprise.inject.Alternative;
 import javax.inject.Inject;
+import javax.interceptor.Interceptor;
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
 
 import org.apache.log4j.Logger;
 
 import br.com.caelum.vraptor4.InterceptionException;
 import br.com.caelum.vraptor4.core.RequestInfo;
-import br.com.caelum.vraptor4.core.OverrideComponent;
 import br.com.caelum.vraptor4.restfulie.controller.ControllerNotFoundHandler;
 
-@OverrideComponent
+@Alternative
+@Priority(Interceptor.Priority.APPLICATION)
 public class BrutalResourceNotFoundHandler implements ControllerNotFoundHandler {
 
 	@Inject private MenuInfo menuInfo;

src/main/java/br/com/caelum/brutal/providers/BrutalRoutesParser.java

@@ -3,19 +3,22 @@
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 
+import javax.annotation.Priority;
+import javax.enterprise.inject.Alternative;
 import javax.inject.Inject;
+import javax.interceptor.Interceptor;
 
 import org.apache.log4j.Logger;
 
 import br.com.caelum.brutal.controllers.ListController;
 import br.com.caelum.vraptor.environment.Environment;
-import br.com.caelum.vraptor4.core.OverrideComponent;
 import br.com.caelum.vraptor4.http.route.PathAnnotationRoutesParser;
 import br.com.caelum.vraptor4.http.route.Router;
 import br.com.caelum.vraptor4.ioc.ApplicationScoped;
 
 @ApplicationScoped
-@OverrideComponent
+@Alternative
+@Priority(Interceptor.Priority.APPLICATION)
 public class BrutalRoutesParser extends PathAnnotationRoutesParser {
 	private static final Logger LOG = Logger.getLogger(BrutalRoutesParser.class);
 

src/main/java/br/com/caelum/brutal/providers/SessionFactoryCreator.java

@@ -4,9 +4,9 @@
 import java.util.Properties;
 
 import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
 import javax.annotation.Priority;
 import javax.enterprise.inject.Alternative;
+import javax.enterprise.inject.Disposes;
 import javax.enterprise.inject.Produces;
 import javax.inject.Inject;
 import javax.interceptor.Interceptor;
@@ -100,22 +100,21 @@ private void init() {
 
 	}
 
-
 	@Produces
+	@javax.enterprise.context.ApplicationScoped
 	public SessionFactory getInstance() {
 		return factory;
 	}
 
-	@PreDestroy
-	void destroy() {
-		if(!factory.isClosed()) {
-		factory.close();
+	void destroy(@Disposes SessionFactory factory) {
+		if (!factory.isClosed()) {
+			factory.close();
 		}
 		factory = null;
 	}
 
 	public void dropAndCreate() {
-		destroy();
+		destroy(this.factory);
 		new SchemaExport(cfg).drop(true, true);
 		new SchemaExport(cfg).create(true, true);
 		init();

src/main/java/br/com/caelum/brutal/providers/SessionProvider.java

@@ -1,16 +1,19 @@
 package br.com.caelum.brutal.providers;
 
 import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import javax.annotation.Priority;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Alternative;
+import javax.enterprise.inject.Disposes;
 import javax.enterprise.inject.Produces;
 import javax.inject.Inject;
+import javax.interceptor.Interceptor;
 
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 
-import br.com.caelum.vraptor4.core.OverrideComponent;
-
-@OverrideComponent
+@Alternative
+@Priority(Interceptor.Priority.APPLICATION)
 public class SessionProvider {
 
 	private SessionFactory factory;
@@ -31,12 +34,12 @@ public void create() {
 	}
 
 	@Produces
+	@RequestScoped
 	public Session getInstance() {
 		return session; 
 	}
 
-	@PreDestroy
-	public void destroy() {
+	public void destroy(@Disposes Session session) {
 	    session.close();
 	}
 

src/main/java/br/com/caelum/brutal/providers/TransactionInterceptor.java

@@ -1,5 +1,6 @@
 package br.com.caelum.brutal.providers;
 
+import javax.enterprise.inject.Specializes;
 import javax.inject.Inject;
 
 import org.hibernate.Session;
@@ -9,12 +10,10 @@
 import br.com.caelum.vraptor.plugin.hibernate4.HibernateTransactionInterceptor;
 import br.com.caelum.vraptor4.Intercepts;
 import br.com.caelum.vraptor4.Validator;
-import br.com.caelum.vraptor4.core.OverrideComponent;
 import br.com.caelum.vraptor4.interceptor.SimpleInterceptorStack;
 
-//TODO: override original interceptor using cdi
 @Intercepts
-@OverrideComponent
+@Specializes
 public class TransactionInterceptor extends HibernateTransactionInterceptor {
 
 	private Session session;

src/main/java/br/com/caelum/brutal/template/TemplatePathResolver.java

@@ -1,14 +1,17 @@
 package br.com.caelum.brutal.template;
 
+import javax.annotation.Priority;
+import javax.enterprise.inject.Alternative;
 import javax.inject.Inject;
+import javax.interceptor.Interceptor;
 
 import br.com.caelum.brutal.controllers.BrutalTemplatesController;
-import br.com.caelum.vraptor4.core.OverrideComponent;
 import br.com.caelum.vraptor4.http.FormatResolver;
 import br.com.caelum.vraptor4.restfulie.controller.ControllerMethod;
 import br.com.caelum.vraptor4.view.DefaultPathResolver;
 
-@OverrideComponent
+@Alternative
+@Priority(Interceptor.Priority.APPLICATION)
 public class TemplatePathResolver extends DefaultPathResolver{
 
 	@Deprecated