Author: nickarls Date: 2010-04-26 06:39:46 -0400 (Mon, 26 Apr 2010) New Revision: 12642 Added: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/beanManager/BeanManagerServletContextListener.java Removed: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/BeanManagerServletContextListener.java Modified: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/beanManager/FacesServletContextBeanManagerProvider.java modules/faces/trunk/impl/src/main/resources/META-INF/web-fragment.xml Log: Move the listener Copied: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/beanManager/BeanManagerServletContextListener.java (from rev 12637, modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/BeanManagerServletContextListener.java) =================================================================== --- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/beanManager/BeanManagerServletContextListener.java (rev 0) +++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/beanManager/BeanManagerServletContextListener.java 2010-04-26 10:39:46 UTC (rev 12642) @@ -0,0 +1,52 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc., and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.seam.faces.beanManager; + +import javax.enterprise.inject.spi.BeanManager; +import javax.inject.Inject; +import javax.servlet.ServletContextEvent; +import javax.servlet.ServletContextListener; + +/** + * A Servlet Context Listener that places the BeanManager under a known attribute key + * + * @author Nicklas Karlsson + * + */ +public class BeanManagerServletContextListener implements ServletContextListener +{ + public static final String BEANMANAGER_SERVLETCONTEXT_KEY = "org.jboss.seam.faces.javax.enterprise.spi.BeanManager"; + + @Inject + private BeanManager beanManager; + + public void contextDestroyed(ServletContextEvent sce) + { + } + + public void contextInitialized(ServletContextEvent sce) + { + sce.getServletContext().setAttribute(BEANMANAGER_SERVLETCONTEXT_KEY, beanManager); + } + + +} Modified: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/beanManager/FacesServletContextBeanManagerProvider.java =================================================================== --- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/beanManager/FacesServletContextBeanManagerProvider.java 2010-04-26 09:50:17 UTC (rev 12641) +++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/beanManager/FacesServletContextBeanManagerProvider.java 2010-04-26 10:39:46 UTC (rev 12642) @@ -28,7 +28,6 @@ import javax.faces.context.FacesContext; import javax.servlet.ServletContext; -import org.jboss.seam.faces.event.BeanManagerServletContextListener; import org.jboss.weld.extensions.beanManager.BeanManagerProvider; /** Deleted: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/BeanManagerServletContextListener.java =================================================================== --- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/BeanManagerServletContextListener.java 2010-04-26 09:50:17 UTC (rev 12641) +++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/BeanManagerServletContextListener.java 2010-04-26 10:39:46 UTC (rev 12642) @@ -1,52 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc., and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.seam.faces.event; - -import javax.enterprise.inject.spi.BeanManager; -import javax.inject.Inject; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; - -/** - * A Servlet Context Listener that places the BeanManager under a known attribute key - * - * @author Nicklas Karlsson - * - */ -public class BeanManagerServletContextListener implements ServletContextListener -{ - public static final String BEANMANAGER_SERVLETCONTEXT_KEY = "org.jboss.seam.faces.javax.enterprise.spi.BeanManager"; - - @Inject - private BeanManager beanManager; - - public void contextDestroyed(ServletContextEvent sce) - { - } - - public void contextInitialized(ServletContextEvent sce) - { - sce.getServletContext().setAttribute(BEANMANAGER_SERVLETCONTEXT_KEY, beanManager); - } - - -} Modified: modules/faces/trunk/impl/src/main/resources/META-INF/web-fragment.xml =================================================================== --- modules/faces/trunk/impl/src/main/resources/META-INF/web-fragment.xml 2010-04-26 09:50:17 UTC (rev 12641) +++ modules/faces/trunk/impl/src/main/resources/META-INF/web-fragment.xml 2010-04-26 10:39:46 UTC (rev 12642) @@ -5,7 +5,7 @@ <name>seamfaces</name> <listener> - <listener-class>org.jboss.seam.faces.event.BeanManagerServletContextListener</listener-class> + <listener-class>org.jboss.seam.faces.beanManager.BeanManagerServletContextListener</listener-class> </listener> </web-fragment> \ No newline at end of file