[seam-commits] Seam SVN: r12255 - in modules: servlet/trunk and 1 other directories.

[seam-commits at lists.jboss.org]

Author: nickarls
Date: 2010-03-24 04:44:41 -0400 (Wed, 24 Mar 2010)
New Revision: 12255

Modified:
   modules/faces/trunk/pom.xml
   modules/servlet/trunk/pom.xml
   modules/servlet/trunk/src/main/java/org/jboss/seam/servlet/event/ServletEventListener.java
Log:
change scope of arquillian artifact to test (was pulling in too much in deps)
lose injection in listener
include logger in servlet dep

Modified: modules/faces/trunk/pom.xml
===================================================================
--- modules/faces/trunk/pom.xml	2010-03-23 22:21:04 UTC (rev 12254)
+++ modules/faces/trunk/pom.xml	2010-03-24 08:44:41 UTC (rev 12255)
@@ -108,6 +108,7 @@
 			<groupId>org.jboss.arquillian.container</groupId>
 			<artifactId>arquillian-weld-embedded</artifactId>
 			<version>${arquillian.version}</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.jboss.jsfunit</groupId>

Modified: modules/servlet/trunk/pom.xml
===================================================================
--- modules/servlet/trunk/pom.xml	2010-03-23 22:21:04 UTC (rev 12254)
+++ modules/servlet/trunk/pom.xml	2010-03-24 08:44:41 UTC (rev 12255)
@@ -72,6 +72,11 @@
 			<artifactId>jsr250-api</artifactId>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.jboss.weld</groupId>
+			<artifactId>weld-extensions</artifactId>
+			<version>1.0.0.Alpha1</version>
+		</dependency>		
 
 		<!-- Test Dependencies -->
 		<dependency>
@@ -90,6 +95,7 @@
 			<groupId>org.jboss.arquillian.container</groupId>
 			<artifactId>arquillian-weld-embedded</artifactId>
 			<version>${arquillian.version}</version>
+			<scope>test</scope>
 		</dependency>
 	</dependencies>
 

Modified: modules/servlet/trunk/src/main/java/org/jboss/seam/servlet/event/ServletEventListener.java
===================================================================
--- modules/servlet/trunk/src/main/java/org/jboss/seam/servlet/event/ServletEventListener.java	2010-03-23 22:21:04 UTC (rev 12254)
+++ modules/servlet/trunk/src/main/java/org/jboss/seam/servlet/event/ServletEventListener.java	2010-03-24 08:44:41 UTC (rev 12255)
@@ -7,7 +7,6 @@
 
 import javax.enterprise.inject.spi.BeanManager;
 import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Inject;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import javax.servlet.AsyncEvent;
@@ -43,6 +42,7 @@
 import org.jboss.seam.servlet.event.qualifier.ValueUnbound;
 import org.jboss.seam.servlet.event.qualifier.WillPassivate;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A self-registering web-listener that propagates the events to the current CDI
@@ -54,12 +54,10 @@
 @WebListener
 public class ServletEventListener implements HttpSessionActivationListener, HttpSessionAttributeListener, HttpSessionBindingListener, HttpSessionListener, ServletContextListener, ServletContextAttributeListener, ServletRequestListener, ServletRequestAttributeListener, AsyncListener
 {
-   @Inject
    private BeanManager beanManager;
-   
-   @Inject
-   private Logger log;
 
+   private Logger log = LoggerFactory.getLogger(ServletEventListener.class);
+
    // FIXME: hack to work around invalid binding in JBoss AS 6 M2
    private static final List<String> beanManagerLocations = new ArrayList<String>()
    {
@@ -72,10 +70,7 @@
 
    public ServletEventListener()
    {
-      if (beanManager == null)
-      {
-         beanManager = lookupBeanManager();
-      }
+      beanManager = lookupBeanManager();
    }
 
    private BeanManager lookupBeanManager()