Rollback.

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@310 1c488680-804c-0410-94cd-c6b725194a0e
weld · Nov 14, 2008 · 96b0081 · 96b0081
1 parent 521bccd
commit 96b0081
Show file tree

Hide file tree

Showing 12 changed files with 5 additions and 525 deletions.
diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/Lifecycle.java b/webbeans-ri/src/main/java/org/jboss/webbeans/Lifecycle.java
@@ -1,52 +1,23 @@
 package org.jboss.webbeans;
 
-import java.util.Map;
-
-import javax.webbeans.ApplicationScoped;
-import javax.webbeans.SessionScoped;
-
-import org.jboss.webbeans.contexts.Contexts;
-import org.jboss.webbeans.contexts.SessionContext;
-import org.jboss.webbeans.servlet.ServletApplicationMap;
-import org.jboss.webbeans.servlet.ServletSessionMap;
 
 public class Lifecycle
 {
-   private static ServletApplicationMap application;
-
-   public static void beginApplication(ServletApplicationMap serverApplicationMap)
+   public static void beginApplication()
    {
-      application = serverApplicationMap;
    }
 
-   public static Map<String, Object> getApplication() 
-   {
-      return application;
-   }   
-
    public static void endApplication()
    {
-      Contexts.destroyContext(ApplicationScoped.class);
-      Contexts.applicationContext.set(null);
-      application = null;
    }
 
-   public static void beginSession(ServletSessionMap servletSessionMap)
+   public static void beginSession()
    {
-      Contexts.sessionContext.set(new SessionContext(servletSessionMap));
    }
 
-   public static void endSession(ServletSessionMap servletSessionMap)
+   public static void endSession()
    {
-      Contexts.destroyContext(SessionScoped.class);
-      Contexts.sessionContext.set(null);
    }
 
-   public static void clearThreadlocals() 
-   {
-      Contexts.applicationContext.set(null);
-      Contexts.sessionContext.set(null);
-      Contexts.requestContext.set(null);
-   }   
 
 }
diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/ApplicationContext.java b/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/ApplicationContext.java
@@ -1,7 +1,5 @@
 package org.jboss.webbeans.contexts;
 
-import java.util.Map;
-
 import javax.webbeans.ApplicationScoped;
 
 public class ApplicationContext extends NormalContext {
@@ -11,11 +9,6 @@ public ApplicationContext()
       super(ApplicationScoped.class);
    }
 
-   public ApplicationContext(Map<String, Object> data)
-   {
-      super(ApplicationScoped.class, data);
-   }   
-
    @Override
    public String toString()
    {

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/Contexts.java b/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/Contexts.java
diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/NormalContext.java b/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/NormalContext.java
@@ -1,7 +1,6 @@
 package org.jboss.webbeans.contexts;
 
 import java.lang.annotation.Annotation;
-import java.util.Map;
 
 import javax.webbeans.ContextNotActiveException;
 import javax.webbeans.manager.Bean;
@@ -19,12 +18,6 @@ public NormalContext(Class<? extends Annotation> scopeType)
       active = true;
    }
 
-   public NormalContext(Class<? extends Annotation> scopeType, Map<String, Object> data) {
-      super(scopeType);
-      // TODO: load data into map
-      active = true;
-   }
-
    public <T> T get(Bean<T> bean, boolean create)
    {
       if (!active)

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/RequestContext.java b/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/RequestContext.java
@@ -1,7 +1,5 @@
 package org.jboss.webbeans.contexts;
 
-import java.util.Map;
-
 import javax.webbeans.RequestScoped;
 
 public class RequestContext extends NormalContext
@@ -12,11 +10,6 @@ public RequestContext()
       super(RequestScoped.class);
    }
 
-   public RequestContext(Map<String, Object> data)
-   {
-      super(RequestScoped.class, data);
-   }
-
    @Override
    public String toString()
    {

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/SessionContext.java b/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/SessionContext.java
@@ -1,7 +1,5 @@
 package org.jboss.webbeans.contexts;
 
-import java.util.Map;
-
 import javax.webbeans.SessionScoped;
 
 public class SessionContext extends NormalContext {
@@ -10,11 +8,6 @@ public SessionContext()
    {
       super(SessionScoped.class);
    }
-
-   public SessionContext(Map<String, Object> data)
-   {
-      super(SessionScoped.class, data);
-   }   
 
    @Override
    public String toString()

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ContextualHttpServletRequest.java b/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ContextualHttpServletRequest.java
diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletApplicationMap.java b/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletApplicationMap.java
diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java b/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java
@@ -5,10 +5,6 @@
 import javax.servlet.http.HttpSession;
 
 import org.jboss.webbeans.Lifecycle;
-import org.jboss.webbeans.contexts.ApplicationContext;
-import org.jboss.webbeans.contexts.Contexts;
-import org.jboss.webbeans.contexts.RequestContext;
-import org.jboss.webbeans.contexts.SessionContext;
 
 public class ServletLifecycle
 {
@@ -17,31 +13,25 @@ public class ServletLifecycle
    public static void beginApplication(ServletContext context)
    {
       servletContext = context;  
-      Lifecycle.beginApplication(new ServletApplicationMap(context));
    }
 
    public static void endApplication() {
-      Lifecycle.endApplication();
       servletContext = null;
    }
 
    public static void beginSession(HttpSession session)
    {
-      Lifecycle.beginSession( new ServletSessionMap(session) );
+      Lifecycle.beginSession();
    }
 
    public static void endSession(HttpSession session) {
-      Lifecycle.endSession( new ServletSessionMap(session) );  
+      Lifecycle.endSession();  
    }   
 
    public static void beginRequest(HttpServletRequest request) {
-      Contexts.applicationContext.set(new ApplicationContext( Lifecycle.getApplication() ) );
-      Contexts.requestContext.set( new RequestContext( new ServletRequestMap(request) ) );
-      Contexts.sessionContext.set( new SessionContext( new ServletRequestSessionMap(request) ) );
    }
 
    public static void endRequest(HttpServletRequest request) {
-      Lifecycle.clearThreadlocals();
    }
 
    public static ServletContext getServletContext()