Author: jlmonteiro
Date: Thu Feb 20 16:28:43 2014
New Revision: 1570259

URL: http://svn.apache.org/r1570259
Log:
TOMEE-1130 support ServletContext injection

Added:
    
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalServletContext.java
   (with props)
Modified:
    
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
    
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
    
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalContextManager.java

Modified: 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java?rev=1570259&r1=1570258&r2=1570259&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
 (original)
+++ 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
 Thu Feb 20 16:28:43 2014
@@ -62,6 +62,7 @@ import javax.naming.Name;
 import javax.naming.NamingException;
 import javax.persistence.EntityManagerFactory;
 import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
 import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -321,6 +322,8 @@ public class JndiEncBuilder {
                     reference = new 
ObjectReference(ThreadLocalContextManager.PROVIDERS);
                 } else if (ServletConfig.class.equals(type)) {
                     reference = new 
ObjectReference(ThreadLocalContextManager.SERVLET_CONFIG);
+                } else if (ServletContext.class.equals(type)) {
+                    reference = new 
ObjectReference(ThreadLocalContextManager.SERVLET_CONTEXT);
                 } else if (HttpServletResponse.class.equals(type)) {
                     reference = new 
ObjectReference(ThreadLocalContextManager.HTTP_SERVLET_RESPONSE);
                 } else {

Modified: 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java?rev=1570259&r1=1570258&r2=1570259&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
 (original)
+++ 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
 Thu Feb 20 16:28:43 2014
@@ -69,6 +69,7 @@ import javax.enterprise.inject.spi.BeanM
 import javax.jms.Queue;
 import javax.jms.Topic;
 import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
 import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -143,6 +144,7 @@ public class AutoConfig implements Dynam
         ignoredReferenceTypes.add(ServletRequest.class.getName());
         ignoredReferenceTypes.add(HttpServletRequest.class.getName());
         ignoredReferenceTypes.add(ServletConfig.class.getName());
+        ignoredReferenceTypes.add(ServletContext.class.getName());
         ignoredReferenceTypes.add(HttpServletResponse.class.getName());
     }
 

Modified: 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalContextManager.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalContextManager.java?rev=1570259&r1=1570258&r2=1570259&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalContextManager.java
 (original)
+++ 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalContextManager.java
 Thu Feb 20 16:28:43 2014
@@ -18,6 +18,7 @@
 package org.apache.openejb.rest;
 
 import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
 import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -33,6 +34,7 @@ import java.util.Map;
 public class ThreadLocalContextManager {
     public static final ThreadLocalRequest REQUEST = new ThreadLocalRequest();
     public static final ThreadLocalServletConfig SERVLET_CONFIG = new 
ThreadLocalServletConfig();
+    public static final ThreadLocalServletContext SERVLET_CONTEXT = new 
ThreadLocalServletContext();
     public static final ThreadLocalServletRequest SERVLET_REQUEST = new 
ThreadLocalServletRequest();
     public static final ThreadLocalHttpServletRequest HTTP_SERVLET_REQUEST = 
new ThreadLocalHttpServletRequest();
     public static final ThreadLocalHttpServletResponse HTTP_SERVLET_RESPONSE = 
new ThreadLocalHttpServletResponse();
@@ -48,6 +50,7 @@ public class ThreadLocalContextManager {
         REQUEST.remove();
         SERVLET_REQUEST.remove();
         SERVLET_CONFIG.remove();
+        SERVLET_CONTEXT.remove();
         HTTP_SERVLET_REQUEST.remove();
         HTTP_SERVLET_RESPONSE.remove();
         URI_INFO.remove();
@@ -85,6 +88,8 @@ public class ThreadLocalContextManager {
             return ThreadLocalContextManager.HTTP_SERVLET_RESPONSE;
         } else if (ServletConfig.class.equals(type)) {
             return ThreadLocalContextManager.SERVLET_CONFIG;
+        } else if (ServletContext.class.equals(type)) {
+            return ThreadLocalContextManager.SERVLET_CONTEXT;
         }
         return null;
     }

Added: 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalServletContext.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalServletContext.java?rev=1570259&view=auto
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalServletContext.java
 (added)
+++ 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalServletContext.java
 Thu Feb 20 16:28:43 2014
@@ -0,0 +1,297 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.openejb.rest;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterRegistration;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.Servlet;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRegistration;
+import javax.servlet.SessionCookieConfig;
+import javax.servlet.SessionTrackingMode;
+import javax.servlet.descriptor.JspConfigDescriptor;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.EventListener;
+import java.util.Map;
+import java.util.Set;
+
+public class ThreadLocalServletContext extends 
AbstractRestThreadLocalProxy<ServletContext> implements ServletContext {
+    protected ThreadLocalServletContext() {
+        super(ServletContext.class);
+    }
+
+    @Override
+    public String getContextPath() {
+        return get().getContextPath();
+    }
+
+    @Override
+    public ServletContext getContext(final String uripath) {
+        return get().getContext(uripath);
+    }
+
+    @Override
+    public int getMajorVersion() {
+        return get().getMajorVersion();
+    }
+
+    @Override
+    public int getMinorVersion() {
+        return get().getMinorVersion();
+    }
+
+    @Override
+    public String getMimeType(final String file) {
+        return get().getMimeType(file);
+    }
+
+    @Override
+    public Set<String> getResourcePaths(final String path) {
+        return get().getResourcePaths(path);
+    }
+
+    @Override
+    public URL getResource(final String path) throws MalformedURLException {
+        return get().getResource(path);
+    }
+
+    @Override
+    public InputStream getResourceAsStream(final String path) {
+        return get().getResourceAsStream(path);
+    }
+
+    @Override
+    public RequestDispatcher getRequestDispatcher(final String path) {
+        return get().getRequestDispatcher(path);
+    }
+
+    @Override
+    public RequestDispatcher getNamedDispatcher(final String name) {
+        return get().getNamedDispatcher(name);
+    }
+
+    @Override
+    public Servlet getServlet(final String name) throws ServletException {
+        return get().getServlet(name);
+    }
+
+    @Override
+    public Enumeration<Servlet> getServlets() {
+        return get().getServlets();
+    }
+
+    @Override
+    public Enumeration<String> getServletNames() {
+        return get().getServletNames();
+    }
+
+    @Override
+    public void log(final String msg) {
+        get().log(msg);
+    }
+
+    @Override
+    public void log(final Exception exception, final String msg) {
+        get().log(exception, msg);
+    }
+
+    @Override
+    public void log(final String message, final Throwable throwable) {
+        get().log(message, throwable);
+    }
+
+    @Override
+    public String getRealPath(final String path) {
+        return get().getRealPath(path);
+    }
+
+    @Override
+    public String getServerInfo() {
+        return get().getServerInfo();
+    }
+
+    @Override
+    public String getInitParameter(final String name) {
+        return get().getInitParameter(name);
+    }
+
+    @Override
+    public Enumeration<String> getInitParameterNames() {
+        return get().getInitParameterNames();
+    }
+
+    @Override
+    public boolean setInitParameter(final String name, final String value) {
+        return get().setInitParameter(name, value);
+    }
+
+    @Override
+    public Object getAttribute(final String name) {
+        return get().getAttribute(name);
+    }
+
+    @Override
+    public Enumeration<String> getAttributeNames() {
+        return get().getAttributeNames();
+    }
+
+    @Override
+    public void setAttribute(final String name, final Object object) {
+        get().setAttribute(name, object);
+    }
+
+    @Override
+    public void removeAttribute(final String name) {
+        get().removeAttribute(name);
+    }
+
+    @Override
+    public String getServletContextName() {
+        return get().getServletContextName();
+    }
+
+    @Override
+    public ServletRegistration.Dynamic addServlet(final String servletName, 
final String className) throws IllegalArgumentException, IllegalStateException {
+        return get().addServlet(servletName, className);
+    }
+
+    @Override
+    public ServletRegistration.Dynamic addServlet(final String servletName, 
final Servlet servlet) throws IllegalArgumentException, IllegalStateException {
+        return get().addServlet(servletName, servlet);
+    }
+
+    @Override
+    public ServletRegistration.Dynamic addServlet(final String servletName, 
final Class<? extends Servlet> clazz) throws IllegalArgumentException, 
IllegalStateException {
+        return get().addServlet(servletName, clazz);
+    }
+
+    @Override
+    public <T extends Servlet> T createServlet(final Class<T> clazz) throws 
ServletException {
+        return get().createServlet(clazz);
+    }
+
+    @Override
+    public ServletRegistration getServletRegistration(final String 
servletName) {
+        return get().getServletRegistration(servletName);
+    }
+
+    @Override
+    public Map<String, ? extends ServletRegistration> 
getServletRegistrations() {
+        return get().getServletRegistrations();
+    }
+
+    @Override
+    public FilterRegistration.Dynamic addFilter(final String filterName, final 
String className) throws IllegalArgumentException, IllegalStateException {
+        return get().addFilter(filterName, className);
+    }
+
+    @Override
+    public FilterRegistration.Dynamic addFilter(final String filterName, final 
Filter filter) throws IllegalArgumentException, IllegalStateException {
+        return get().addFilter(filterName, filter);
+    }
+
+    @Override
+    public FilterRegistration.Dynamic addFilter(final String filterName, final 
Class<? extends Filter> filterClass) throws IllegalArgumentException, 
IllegalStateException {
+        return get().addFilter(filterName, filterClass);
+    }
+
+    @Override
+    public <T extends Filter> T createFilter(final Class<T> clazz) throws 
ServletException {
+        return get().createFilter(clazz);
+    }
+
+    @Override
+    public FilterRegistration getFilterRegistration(final String filterName) {
+        return get().getFilterRegistration(filterName);
+    }
+
+    @Override
+    public Map<String, ? extends FilterRegistration> getFilterRegistrations() {
+        return get().getFilterRegistrations();
+    }
+
+    @Override
+    public void addListener(final Class<? extends EventListener> 
listenerClass) {
+        get().addListener(listenerClass);
+    }
+
+    @Override
+    public void addListener(final String className) {
+        get().addListener(className);
+    }
+
+    @Override
+    public <T extends EventListener> void addListener(final T t) {
+        get().addListener(t);
+    }
+
+    @Override
+    public <T extends EventListener> T createListener(final Class<T> clazz) 
throws ServletException {
+        return get().createListener(clazz);
+    }
+
+    @Override
+    public void declareRoles(final String... roleNames) {
+        get().declareRoles(roleNames);
+    }
+
+    @Override
+    public SessionCookieConfig getSessionCookieConfig() {
+        return get().getSessionCookieConfig();
+    }
+
+    @Override
+    public void setSessionTrackingModes(final Set<SessionTrackingMode> 
sessionTrackingModes) {
+        get().setSessionTrackingModes(sessionTrackingModes);
+    }
+
+    @Override
+    public Set<SessionTrackingMode> getDefaultSessionTrackingModes() {
+        return get().getDefaultSessionTrackingModes();
+    }
+
+    @Override
+    public int getEffectiveMajorVersion() throws UnsupportedOperationException 
{
+        return get().getEffectiveMajorVersion();
+    }
+
+    @Override
+    public int getEffectiveMinorVersion() throws UnsupportedOperationException 
{
+        return get().getEffectiveMinorVersion();
+    }
+
+    @Override
+    public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() {
+        return get().getEffectiveSessionTrackingModes();
+    }
+
+    @Override
+    public ClassLoader getClassLoader() {
+        return get().getClassLoader();
+    }
+
+    @Override
+    public JspConfigDescriptor getJspConfigDescriptor() {
+        return get().getJspConfigDescriptor();
+    }
+}

Propchange: 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/rest/ThreadLocalServletContext.java
------------------------------------------------------------------------------
    svn:executable = *


Reply via email to