[webbeans-commits] Webbeans SVN: r1716 - ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet.

[webbeans-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-02-26 07:00:55 -0500 (Thu, 26 Feb 2009)
New Revision: 1716

Modified:
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/WebBeansListener.java
Log:
minor

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java	2009-02-26 11:22:53 UTC (rev 1715)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java	2009-02-26 12:00:55 UTC (rev 1716)
@@ -17,7 +17,6 @@
 
 package org.jboss.webbeans.servlet;
 
-import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
@@ -36,7 +35,6 @@
  * @author Pete Muir
  * @author Nicklas Karlsson
  */
- at Deprecated
 public class ServletLifecycle extends AbstractLifecycle
 {
 
@@ -55,32 +53,6 @@
    private static LogProvider log = Logging.getLogProvider(ServletLifecycle.class);
 
    /**
-    * Starts the application
-    * 
-    * Runs the bootstrapper for bean discover and initialization
-    * 
-    * @param context The servlet context
-    */
-   public void beginApplication(ServletContext servletContext)
-   {
-      /*ServletInitialization servletInitialization = new ServletInitialization(servletContext).initialize();
-      super.initialize();
-      super.beginApplication(servletContext.getServletContextName(), new ApplicationBeanStore(servletContext));
-      BeanStore requestBeanStore = new ConcurrentHashMapBeanStore();
-      super.beginDeploy(requestBeanStore);
-      servletInitialization.start();
-      super.endDeploy(requestBeanStore);*/
-   }
-
-   /**
-    * Ends the application
-    */
-   public void endApplication(ServletContext servletContext)
-   {
-      //super.endApplication(servletContext.getServletContextName(), new ApplicationBeanStore(servletContext));
-   }
-
-   /**
     * Begins a session
     * 
     * @param session The HTTP session

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/WebBeansListener.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/WebBeansListener.java	2009-02-26 11:22:53 UTC (rev 1715)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/WebBeansListener.java	2009-02-26 12:00:55 UTC (rev 1716)
@@ -17,8 +17,6 @@
 
 package org.jboss.webbeans.servlet;
 
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
 import javax.servlet.ServletRequestEvent;
 import javax.servlet.ServletRequestListener;
 import javax.servlet.http.HttpServletRequest;
@@ -35,7 +33,7 @@
  * @author Nicklas Karlsson
  *
  */
-public class WebBeansListener implements ServletContextListener, HttpSessionListener, ServletRequestListener
+public class WebBeansListener implements HttpSessionListener, ServletRequestListener
 {
    
    private final ServletLifecycle lifecycle;
@@ -44,17 +42,6 @@
    {
       lifecycle = ServletLifecycle.instance();
    }
-   
-   /**
-    * Called when the context is initialized (application started)
-    * 
-    * @param event The context event
-    */
-   public void contextInitialized(ServletContextEvent event) 
-   {
-      
-      lifecycle.beginApplication(event.getServletContext());
-   }
 
    /**
     * Called when the session is created
@@ -77,16 +64,6 @@
    }
 
    /**
-    * Called when the context is destroyed (application scoped)
-    * 
-    * @param event The context event
-    */
-   public void contextDestroyed(ServletContextEvent event) 
-   {
-      lifecycle.endApplication(event.getServletContext());
-   }
-
-   /**
     * Called when the request is destroyed
     * 
     * @param event The request event