[seam-commits] Seam SVN: r13779 - modules/servlet/trunk/impl/src/main/java/org/jboss/seam/servlet/http.

[seam-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2010-09-26 16:52:36 -0400 (Sun, 26 Sep 2010)
New Revision: 13779

Modified:
   modules/servlet/trunk/impl/src/main/java/org/jboss/seam/servlet/http/HttpServletEnvironmentProducer.java
   modules/servlet/trunk/impl/src/main/java/org/jboss/seam/servlet/http/ServletContextProducer.java
Log:
revert to slf4j, problems on EAP 5

Modified: modules/servlet/trunk/impl/src/main/java/org/jboss/seam/servlet/http/HttpServletEnvironmentProducer.java
===================================================================
--- modules/servlet/trunk/impl/src/main/java/org/jboss/seam/servlet/http/HttpServletEnvironmentProducer.java	2010-09-26 20:32:24 UTC (rev 13778)
+++ modules/servlet/trunk/impl/src/main/java/org/jboss/seam/servlet/http/HttpServletEnvironmentProducer.java	2010-09-26 20:52:36 UTC (rev 13779)
@@ -27,14 +27,14 @@
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.event.Observes;
 import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
 import javax.servlet.ServletRequestEvent;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
-import org.jboss.logging.Logger;
 import org.jboss.seam.servlet.event.qualifier.Destroyed;
 import org.jboss.seam.servlet.event.qualifier.Initialized;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A manager for acquiring HTTP artifacts
@@ -50,19 +50,18 @@
    private final ThreadLocal<HttpSession> session = new ThreadLocal<HttpSession>();
    private final ThreadLocal<HttpServletRequest> request = new ThreadLocal<HttpServletRequest>();
 
-   @Inject
-   private Logger log;
+   private Logger log = LoggerFactory.getLogger(HttpServletEnvironmentProducer.class);
 
    protected void requestInitialized(@Observes @Initialized final ServletRequestEvent e)
    {
-      log.tracev("Servlet request initialized with event #0", e);
+      log.trace("Servlet request initialized with event #0", e);
       request.set((HttpServletRequest) e.getServletRequest());
       session.set(request.get().getSession());
    }
 
    protected void requestDestroyed(@Observes @Destroyed final ServletRequestEvent e)
    {
-      log.tracev("Servlet request destroyed with event #0", e);
+      log.trace("Servlet request destroyed with event #0", e);
    }
 
    @Produces

Modified: modules/servlet/trunk/impl/src/main/java/org/jboss/seam/servlet/http/ServletContextProducer.java
===================================================================
--- modules/servlet/trunk/impl/src/main/java/org/jboss/seam/servlet/http/ServletContextProducer.java	2010-09-26 20:32:24 UTC (rev 13778)
+++ modules/servlet/trunk/impl/src/main/java/org/jboss/seam/servlet/http/ServletContextProducer.java	2010-09-26 20:52:36 UTC (rev 13779)
@@ -29,10 +29,11 @@
 import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
 
-import org.jboss.logging.Logger;
 import org.jboss.seam.servlet.beanManager.ServletContextBeanManagerProvider;
 import org.jboss.seam.servlet.event.qualifier.Destroyed;
 import org.jboss.seam.servlet.event.qualifier.Initialized;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * 
@@ -50,12 +51,11 @@
    @Inject
    private BeanManager beanManager;
 
-   @Inject
-   private Logger log;
+   private Logger log = LoggerFactory.getLogger(ServletContextProducer.class);
 
    protected void contextInitialized(@Observes @Initialized ServletContextEvent e)
    {
-      log.debugv("Servlet context initialized with event #0", e);
+      log.debug("Servlet context initialized with event #0", e);
       servletContext = e.getServletContext();
       servletContext.setAttribute(BeanManager.class.getName(), beanManager);
       ServletContextBeanManagerProvider.setServletContext(servletContext);
@@ -63,7 +63,7 @@
 
    protected void contextDestroyed(@Observes @Destroyed ServletContextEvent e)
    {
-      log.debugv("Servlet context destroyed with event #0", e);
+      log.debug("Servlet context destroyed with event #0", e);
       servletContext = null;
    }