[webbeans-commits] Webbeans SVN: r310 - in ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans: contexts and 1 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Fri Nov 14 08:12:23 EST 2008
Author: nickarls
Date: 2008-11-14 08:12:23 -0500 (Fri, 14 Nov 2008)
New Revision: 310
Removed:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/Contexts.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ContextualHttpServletRequest.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletApplicationMap.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletRequestMap.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletRequestSessionMap.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletSessionMap.java
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/Lifecycle.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/ApplicationContext.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/NormalContext.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/RequestContext.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/SessionContext.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java
Log:
Rollback.
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/Lifecycle.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/Lifecycle.java 2008-11-14 13:06:02 UTC (rev 309)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/Lifecycle.java 2008-11-14 13:12:23 UTC (rev 310)
@@ -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);
- }
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/ApplicationContext.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/ApplicationContext.java 2008-11-14 13:06:02 UTC (rev 309)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/ApplicationContext.java 2008-11-14 13:12:23 UTC (rev 310)
@@ -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 @@
super(ApplicationScoped.class);
}
- public ApplicationContext(Map<String, Object> data)
- {
- super(ApplicationScoped.class, data);
- }
-
@Override
public String toString()
{
Deleted: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/Contexts.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/Contexts.java 2008-11-14 13:06:02 UTC (rev 309)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/Contexts.java 2008-11-14 13:12:23 UTC (rev 310)
@@ -1,30 +0,0 @@
-package org.jboss.webbeans.contexts;
-
-import java.lang.annotation.Annotation;
-
-import javax.webbeans.manager.Context;
-
-public class Contexts
-{
- public static final ThreadLocal<Context> sessionContext = new ThreadLocal<Context>();
- public static final ThreadLocal<Context> requestContext = new ThreadLocal<Context>();
- public static final ThreadLocal<Context> applicationContext = new ThreadLocal<Context>();
-
- public Context getSessionContext() {
- return sessionContext.get();
- }
-
- public Context getRequestContext() {
- return requestContext.get();
- }
-
- public Context getApplicationContext() {
- return applicationContext.get();
- }
-
- public static void destroyContext(Class<? extends Annotation> scopeType)
- {
- // TODO: destroy the context;
- }
-
-}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/NormalContext.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/NormalContext.java 2008-11-14 13:06:02 UTC (rev 309)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/NormalContext.java 2008-11-14 13:12:23 UTC (rev 310)
@@ -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 @@
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)
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/RequestContext.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/RequestContext.java 2008-11-14 13:06:02 UTC (rev 309)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/RequestContext.java 2008-11-14 13:12:23 UTC (rev 310)
@@ -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 @@
super(RequestScoped.class);
}
- public RequestContext(Map<String, Object> data)
- {
- super(RequestScoped.class, data);
- }
-
@Override
public String toString()
{
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/SessionContext.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/SessionContext.java 2008-11-14 13:06:02 UTC (rev 309)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/SessionContext.java 2008-11-14 13:12:23 UTC (rev 310)
@@ -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 @@
{
super(SessionScoped.class);
}
-
- public SessionContext(Map<String, Object> data)
- {
- super(SessionScoped.class, data);
- }
@Override
public String toString()
Deleted: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ContextualHttpServletRequest.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ContextualHttpServletRequest.java 2008-11-14 13:06:02 UTC (rev 309)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ContextualHttpServletRequest.java 2008-11-14 13:12:23 UTC (rev 310)
@@ -1,41 +0,0 @@
-package org.jboss.webbeans.servlet;
-
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-
-
-public abstract class ContextualHttpServletRequest
-{
- private final HttpServletRequest request;
-
- public ContextualHttpServletRequest(HttpServletRequest request)
- {
- this.request = request;
- }
-
- public abstract void process() throws Exception;
-
- public void run() throws ServletException, IOException
- {
- ServletLifecycle.beginRequest(request);
-
- if (request.getSession(false) == null)
- {
- request.getSession(true);
- }
-
- try
- {
- process();
- } catch (Exception e)
- {
- throw new IOException(e);
- } finally
- {
- ServletLifecycle.endRequest(request);
- }
- }
-
-}
Deleted: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletApplicationMap.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletApplicationMap.java 2008-11-14 13:06:02 UTC (rev 309)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletApplicationMap.java 2008-11-14 13:12:23 UTC (rev 310)
@@ -1,90 +0,0 @@
-package org.jboss.webbeans.servlet;
-
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import javax.servlet.ServletContext;
-
-public class ServletApplicationMap implements Map<String, Object>
-{
- private ServletContext servletContext;
-
- public ServletApplicationMap(ServletContext servletContext)
- {
- this.servletContext = servletContext;
- }
-
- public void clear()
- {
- throw new UnsupportedOperationException();
- }
-
- public boolean containsKey(Object key)
- {
- return servletContext.getAttribute( (String) key )!=null;
- }
-
- public boolean containsValue(Object value)
- {
- throw new UnsupportedOperationException();
- }
-
- public Set<java.util.Map.Entry<String, Object>> entrySet()
- {
- throw new UnsupportedOperationException();
- }
-
- public Object get(Object key)
- {
- return servletContext.getAttribute( (String) key );
- }
-
- public boolean isEmpty()
- {
- throw new UnsupportedOperationException();
- }
-
- public Set<String> keySet()
- {
- Set<String> keys = new HashSet<String>();
- Enumeration<String> names = servletContext.getAttributeNames();
- while ( names.hasMoreElements() )
- {
- keys.add( names.nextElement() );
- }
- return keys;
- }
-
- public Object put(String key, Object value)
- {
- Object result = servletContext.getAttribute(key);
- servletContext.setAttribute(key, value);
- return result;
- }
-
- public void putAll(Map<? extends String, ? extends Object> t)
- {
- throw new UnsupportedOperationException();
- }
-
- public Object remove(Object key)
- {
- Object result = servletContext.getAttribute( (String) key );
- servletContext.removeAttribute( (String) key );
- return result;
- }
-
- public int size()
- {
- throw new UnsupportedOperationException();
- }
-
- public Collection<Object> values()
- {
- throw new UnsupportedOperationException();
- }
-
-}
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 2008-11-14 13:06:02 UTC (rev 309)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java 2008-11-14 13:12:23 UTC (rev 310)
@@ -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 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()
Deleted: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletRequestMap.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletRequestMap.java 2008-11-14 13:06:02 UTC (rev 309)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletRequestMap.java 2008-11-14 13:12:23 UTC (rev 310)
@@ -1,91 +0,0 @@
-package org.jboss.webbeans.servlet;
-
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import javax.servlet.ServletRequest;
-
-public class ServletRequestMap implements Map<String, Object>
-{
-
- private ServletRequest request;
-
- public ServletRequestMap(ServletRequest request)
- {
- this.request = request;
- }
-
- public void clear()
- {
- throw new UnsupportedOperationException();
- }
-
- public boolean containsKey(Object key)
- {
- return request.getAttribute( (String) key )!=null;
- }
-
- public boolean containsValue(Object value)
- {
- throw new UnsupportedOperationException();
- }
-
- public Set<java.util.Map.Entry<String, Object>> entrySet()
- {
- throw new UnsupportedOperationException();
- }
-
- public Object get(Object key)
- {
- return request.getAttribute( (String) key );
- }
-
- public boolean isEmpty()
- {
- throw new UnsupportedOperationException();
- }
-
- public Set<String> keySet()
- {
- Set<String> keys = new HashSet<String>();
- Enumeration<String> names = request.getAttributeNames();
- while ( names.hasMoreElements() )
- {
- keys.add( names.nextElement() );
- }
- return keys;
- }
-
- public Object put(String key, Object value)
- {
- Object result = request.getAttribute(key);
- request.setAttribute(key, value);
- return result;
- }
-
- public void putAll(Map<? extends String, ? extends Object> t)
- {
- throw new UnsupportedOperationException();
- }
-
- public Object remove(Object key)
- {
- Object result = request.getAttribute( (String) key );
- request.removeAttribute( (String) key );
- return result;
- }
-
- public int size()
- {
- throw new UnsupportedOperationException();
- }
-
- public Collection<Object> values()
- {
- throw new UnsupportedOperationException();
- }
-
-}
Deleted: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletRequestSessionMap.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletRequestSessionMap.java 2008-11-14 13:06:02 UTC (rev 309)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletRequestSessionMap.java 2008-11-14 13:12:23 UTC (rev 310)
@@ -1,111 +0,0 @@
-package org.jboss.webbeans.servlet;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
-public class ServletRequestSessionMap implements Map<String, Object>
-{
- private HttpServletRequest request;
-
- public ServletRequestSessionMap(HttpServletRequest request)
- {
- this.request = request;
- }
-
- public void clear()
- {
- throw new UnsupportedOperationException();
- }
-
- public boolean containsKey(Object key)
- {
- HttpSession session = request.getSession(false);
- return session==null ? false : session.getAttribute( (String) key )!=null;
- }
-
- public boolean containsValue(Object value)
- {
- throw new UnsupportedOperationException();
- }
-
- public Set<java.util.Map.Entry<String, Object>> entrySet()
- {
- throw new UnsupportedOperationException();
- }
-
- public Object get(Object key)
- {
- HttpSession session = request.getSession(false);
- return session==null ? null : session.getAttribute( (String) key );
- }
-
- public boolean isEmpty()
- {
- throw new UnsupportedOperationException();
- }
-
- public Set<String> keySet()
- {
- HttpSession session = request.getSession(false);
- if (session==null)
- {
- return Collections.EMPTY_SET;
- }
- else
- {
- Set<String> keys = new HashSet<String>();
- Enumeration<String> names = session.getAttributeNames();
- while ( names.hasMoreElements() )
- {
- keys.add( names.nextElement() );
- }
- return keys;
- }
- }
-
- public Object put(String key, Object value)
- {
- HttpSession session = request.getSession(true);
- Object result = session.getAttribute(key);
- session.setAttribute(key, value);
- return result;
- }
-
- public void putAll(Map<? extends String, ? extends Object> t)
- {
- throw new UnsupportedOperationException();
- }
-
- public Object remove(Object key)
- {
- HttpSession session = request.getSession(false);
- if (session==null)
- {
- return null;
- }
- else
- {
- Object result = session.getAttribute( (String) key );
- session.removeAttribute( (String) key );
- return result;
- }
- }
-
- public int size()
- {
- throw new UnsupportedOperationException();
- }
-
- public Collection<Object> values()
- {
- throw new UnsupportedOperationException();
- }
-
-}
Deleted: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletSessionMap.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletSessionMap.java 2008-11-14 13:06:02 UTC (rev 309)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletSessionMap.java 2008-11-14 13:12:23 UTC (rev 310)
@@ -1,90 +0,0 @@
-package org.jboss.webbeans.servlet;
-
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import javax.servlet.http.HttpSession;
-
-public class ServletSessionMap implements Map<String, Object>
-{
- private HttpSession session;
-
- public ServletSessionMap(HttpSession session)
- {
- this.session = session;
- }
-
- public void clear()
- {
- throw new UnsupportedOperationException();
- }
-
- public boolean containsKey(Object key)
- {
- return session.getAttribute( (String) key )!=null;
- }
-
- public boolean containsValue(Object value)
- {
- throw new UnsupportedOperationException();
- }
-
- public Set<java.util.Map.Entry<String, Object>> entrySet()
- {
- throw new UnsupportedOperationException();
- }
-
- public Object get(Object key)
- {
- return session.getAttribute( (String) key );
- }
-
- public boolean isEmpty()
- {
- throw new UnsupportedOperationException();
- }
-
- public Set<String> keySet()
- {
- Set<String> keys = new HashSet<String>();
- Enumeration<String> names = session.getAttributeNames();
- while ( names.hasMoreElements() )
- {
- keys.add( names.nextElement() );
- }
- return keys;
- }
-
- public Object put(String key, Object value)
- {
- Object result = session.getAttribute(key);
- session.setAttribute(key, value);
- return result;
- }
-
- public void putAll(Map<? extends String, ? extends Object> t)
- {
- throw new UnsupportedOperationException();
- }
-
- public Object remove(Object key)
- {
- Object result = session.getAttribute( (String) key );
- session.removeAttribute( (String) key );
- return result;
- }
-
- public int size()
- {
- throw new UnsupportedOperationException();
- }
-
- public Collection<Object> values()
- {
- throw new UnsupportedOperationException();
- }
-
-}
More information about the weld-commits
mailing list