[webbeans-commits] Webbeans SVN: r2399 - in extensions/trunk/tomcat/int/src/main/java/org/jboss/webbeans/environment: servlet/resources and 1 other directories.

Author: pete.muir(a)jboss.org Date: 2009-04-14 09:41:06 -0400 (Tue, 14 Apr 2009) New Revision: 2399 Added: extensions/trunk/tomcat/int/src/main/java/org/jboss/webbeans/environment/servlet/resources/TomcatResourceServices.java extensions/trunk/tomcat/int/src/main/java/org/jboss/webbeans/environment/tomcat/WebBeansAnnotationProcessor.java Modified: extensions/trunk/tomcat/int/src/main/java/org/jboss/webbeans/environment/servlet/Listener.java extensions/trunk/tomcat/int/src/main/java/org/jboss/webbeans/environment/tomcat/ Log: Fix compilation errors Modified: extensions/trunk/tomcat/int/src/main/java/org/jboss/webbeans/environment/servlet/Listener.java =================================================================== --- extensions/trunk/tomcat/int/src/main/java/org/jboss/webbeans/environment/servlet/Listener.java 2009-04-13 14:01:22 UTC (rev 2398) +++ extensions/trunk/tomcat/int/src/main/java/org/jboss/webbeans/environment/servlet/Listener.java 2009-04-14 13:41:06 UTC (rev 2399) @@ -16,9 +16,6 @@ */ package org.jboss.webbeans.environment.servlet; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; import javax.servlet.ServletContextEvent; import org.jboss.webbeans.bootstrap.api.Bootstrap; @@ -28,6 +25,7 @@ import org.jboss.webbeans.context.api.helpers.ConcurrentHashMapBeanStore; import org.jboss.webbeans.environment.servlet.discovery.TomcatWebBeanDiscovery; import org.jboss.webbeans.environment.servlet.resources.ReadOnlyNamingContext; +import org.jboss.webbeans.environment.servlet.resources.TomcatResourceServices; import org.jboss.webbeans.environment.servlet.util.Reflections; import org.jboss.webbeans.environment.tomcat.WebBeansAnnotationProcessor; import org.jboss.webbeans.log.Log; @@ -35,7 +33,6 @@ import org.jboss.webbeans.manager.api.WebBeansManager; import org.jboss.webbeans.resources.spi.NamingContext; import org.jboss.webbeans.resources.spi.ResourceServices; -import org.jboss.webbeans.resources.spi.helpers.AbstractResourceServices; import org.jboss.webbeans.servlet.api.ServletListener; import org.jboss.webbeans.servlet.api.helpers.ForwardingServletListener; @@ -75,12 +72,14 @@ } } + @Override public void contextDestroyed(ServletContextEvent sce) { manager.shutdown(); super.contextDestroyed(sce); } + @Override public void contextInitialized(ServletContextEvent sce) { BeanStore applicationBeanStore = new ConcurrentHashMapBeanStore(); @@ -88,25 +87,7 @@ bootstrap.setEnvironment(Environments.SERVLET); bootstrap.getServices().add(WebBeanDiscovery.class, new TomcatWebBeanDiscovery(sce.getServletContext()) {}); bootstrap.getServices().add(NamingContext.class, new ReadOnlyNamingContext() {}); - final Context context; - try - { - context = new InitialContext(); - } - catch (NamingException e) - { - throw new IllegalStateException("Error creating JNDI context", e); - } - bootstrap.getServices().add(ResourceServices.class, new AbstractResourceServices() - { - - @Override - protected Context getContext() - { - return context; - } - - }); + bootstrap.getServices().add(ResourceServices.class, new TomcatResourceServices() {}); bootstrap.setApplicationContext(applicationBeanStore); bootstrap.initialize(); manager = bootstrap.getManager(); Added: extensions/trunk/tomcat/int/src/main/java/org/jboss/webbeans/environment/servlet/resources/TomcatResourceServices.java =================================================================== --- extensions/trunk/tomcat/int/src/main/java/org/jboss/webbeans/environment/servlet/resources/TomcatResourceServices.java (rev 0) +++ extensions/trunk/tomcat/int/src/main/java/org/jboss/webbeans/environment/servlet/resources/TomcatResourceServices.java 2009-04-14 13:41:06 UTC (rev 2399) @@ -0,0 +1,33 @@ +package org.jboss.webbeans.environment.servlet.resources; + +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.naming.NamingException; + +import org.jboss.webbeans.resources.spi.ResourceServices; +import org.jboss.webbeans.resources.spi.helpers.AbstractResourceServices; + +public abstract class TomcatResourceServices extends AbstractResourceServices implements ResourceServices +{ + + private Context context; + + public TomcatResourceServices() + { + try + { + context = new InitialContext(); + } + catch (NamingException e) + { + throw new IllegalStateException("Error creating JNDI context", e); + } + } + + @Override + protected Context getContext() + { + return context; + } + +} Property changes on: extensions/trunk/tomcat/int/src/main/java/org/jboss/webbeans/environment/servlet/resources/TomcatResourceServices.java ___________________________________________________________________ Name: svn:mime-type + text/plain Property changes on: extensions/trunk/tomcat/int/src/main/java/org/jboss/webbeans/environment/tomcat ___________________________________________________________________ Name: svn:ignore - WebBeansAnnotationProcessor.java Added: extensions/trunk/tomcat/int/src/main/java/org/jboss/webbeans/environment/tomcat/WebBeansAnnotationProcessor.java =================================================================== --- extensions/trunk/tomcat/int/src/main/java/org/jboss/webbeans/environment/tomcat/WebBeansAnnotationProcessor.java (rev 0) +++ extensions/trunk/tomcat/int/src/main/java/org/jboss/webbeans/environment/tomcat/WebBeansAnnotationProcessor.java 2009-04-14 13:41:06 UTC (rev 2399) @@ -0,0 +1,37 @@ +package org.jboss.webbeans.environment.tomcat; + +import java.lang.reflect.InvocationTargetException; + +import javax.naming.NamingException; + +import org.apache.AnnotationProcessor; +import org.jboss.webbeans.manager.api.WebBeansManager; + +public class WebBeansAnnotationProcessor implements AnnotationProcessor +{ + + private final WebBeansManager manager; + + public WebBeansAnnotationProcessor(WebBeansManager manager) + { + this.manager = manager; + } + + public void processAnnotations(Object instance) throws IllegalAccessException, InvocationTargetException, NamingException + { + manager.injectNonContextualInstance(instance); + } + + public void postConstruct(Object arg0) throws IllegalAccessException, InvocationTargetException + { + // TODO Auto-generated method stub + + } + + public void preDestroy(Object arg0) throws IllegalAccessException, InvocationTargetException + { + // TODO Auto-generated method stub + + } + +} Property changes on: extensions/trunk/tomcat/int/src/main/java/org/jboss/webbeans/environment/tomcat/WebBeansAnnotationProcessor.java ___________________________________________________________________ Name: svn:mime-type + text/plain