Author: lincolnthree Date: 2010-04-23 12:31:50 -0400 (Fri, 23 Apr 2010) New Revision: 12610 Added: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/cdi/ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/cdi/BeanManagerAware.java modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/cdi/BeanManagerProvider.java modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/cdi/JndiBeanManagerProvider.java modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/cdi/ServletContextBeanManagerProvider.java Removed: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/beanManager/ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/cdi/BeanManagerAware.java modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/cdi/BeanManagerProvider.java modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/cdi/JndiBeanManagerProvider.java modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/cdi/ServletContextBeanManagerProvider.java modules/faces/trunk/impl/src/main/resources/META-INF/services/org.jboss.weld.extensions.beanManager.BeanManagerProvider Modified: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/DelegatingPhaseListener.java modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/DelegatingSystemEventListener.java modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/PhaseEventBridge.java modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/SystemEventBridge.java modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/PhaseEventBridgeTest.java modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/SystemEventBridgeTest.java Log: Rolled back new Bean Manager infra II (sorry Nik) Copied: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/cdi (from rev 12574, modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/cdi) Deleted: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/cdi/BeanManagerAware.java =================================================================== --- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/cdi/BeanManagerAware.java 2010-04-22 19:15:01 UTC (rev 12574) +++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/cdi/BeanManagerAware.java 2010-04-23 16:31:50 UTC (rev 12610) @@ -1,82 +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.cdi; - -import java.util.ArrayList; -import java.util.List; - -import javax.enterprise.inject.spi.BeanManager; -import javax.enterprise.inject.spi.Extension; -import javax.inject.Inject; - -/** - * Super-class for non-CDI-native components that need a reference to the - * {@link BeanManager} - * <p> - * <b>**WARNING**</b> This class is <b>NEVER</b> safe to use outside of specific - * seam-faces implementation classes, and should be <b>avoided at all costs</b>. - * If you need a handle to the {@link BeanManager} you should probably register - * an {@link Extension} instead of using this class; have you tried using @ - * {@link Inject}? - * - * @author Nicklas Karlsson - */ -public class BeanManagerAware -{ - @Inject - BeanManager beanManager; - - private static final List<BeanManagerProvider> beanManagerProviders; - - static - { - beanManagerProviders = new ArrayList<BeanManagerProvider>(); - beanManagerProviders.add(ServletContextBeanManagerProvider.DEFAULT); - beanManagerProviders.add(JndiBeanManagerProvider.DEFAULT); - beanManagerProviders.add(JndiBeanManagerProvider.JBOSS_HACK); - } - - protected BeanManager getBeanManager() - { - if (beanManager == null) - { - beanManager = lookupBeanManager(); - } - return beanManager; - } - - private BeanManager lookupBeanManager() - { - BeanManager result = null; - - for (BeanManagerProvider provider : beanManagerProviders) - { - result = provider.getBeanManager(); - if (result != null) - { - break; - } - } - return result; - } - -} Copied: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/cdi/BeanManagerAware.java (from rev 12574, modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/cdi/BeanManagerAware.java) =================================================================== --- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/cdi/BeanManagerAware.java (rev 0) +++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/cdi/BeanManagerAware.java 2010-04-23 16:31:50 UTC (rev 12610) @@ -0,0 +1,82 @@ +/* + * 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.cdi; + +import java.util.ArrayList; +import java.util.List; + +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.Extension; +import javax.inject.Inject; + +/** + * Super-class for non-CDI-native components that need a reference to the + * {@link BeanManager} + * <p> + * <b>**WARNING**</b> This class is <b>NEVER</b> safe to use outside of specific + * seam-faces implementation classes, and should be <b>avoided at all costs</b>. + * If you need a handle to the {@link BeanManager} you should probably register + * an {@link Extension} instead of using this class; have you tried using @ + * {@link Inject}? + * + * @author Nicklas Karlsson + */ +public class BeanManagerAware +{ + @Inject + BeanManager beanManager; + + private static final List<BeanManagerProvider> beanManagerProviders; + + static + { + beanManagerProviders = new ArrayList<BeanManagerProvider>(); + beanManagerProviders.add(ServletContextBeanManagerProvider.DEFAULT); + beanManagerProviders.add(JndiBeanManagerProvider.DEFAULT); + beanManagerProviders.add(JndiBeanManagerProvider.JBOSS_HACK); + } + + protected BeanManager getBeanManager() + { + if (beanManager == null) + { + beanManager = lookupBeanManager(); + } + return beanManager; + } + + private BeanManager lookupBeanManager() + { + BeanManager result = null; + + for (BeanManagerProvider provider : beanManagerProviders) + { + result = provider.getBeanManager(); + if (result != null) + { + break; + } + } + return result; + } + +} Deleted: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/cdi/BeanManagerProvider.java =================================================================== --- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/cdi/BeanManagerProvider.java 2010-04-22 19:15:01 UTC (rev 12574) +++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/cdi/BeanManagerProvider.java 2010-04-23 16:31:50 UTC (rev 12610) @@ -1,40 +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.cdi; - -import javax.enterprise.inject.spi.BeanManager; - -/** - * Provider for obtaining a BeanManager - * - * @author Nicklas Karlsson - * - */ -public interface BeanManagerProvider -{ - /** - * Try to obtain a BeanManager - * - * @return The BeanManager (or null if non found at this location) - */ - public abstract BeanManager getBeanManager(); -} Copied: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/cdi/BeanManagerProvider.java (from rev 12574, modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/cdi/BeanManagerProvider.java) =================================================================== --- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/cdi/BeanManagerProvider.java (rev 0) +++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/cdi/BeanManagerProvider.java 2010-04-23 16:31:50 UTC (rev 12610) @@ -0,0 +1,40 @@ +/* + * 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.cdi; + +import javax.enterprise.inject.spi.BeanManager; + +/** + * Provider for obtaining a BeanManager + * + * @author Nicklas Karlsson + * + */ +public interface BeanManagerProvider +{ + /** + * Try to obtain a BeanManager + * + * @return The BeanManager (or null if non found at this location) + */ + public abstract BeanManager getBeanManager(); +} Deleted: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/cdi/JndiBeanManagerProvider.java =================================================================== --- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/cdi/JndiBeanManagerProvider.java 2010-04-22 19:15:01 UTC (rev 12574) +++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/cdi/JndiBeanManagerProvider.java 2010-04-23 16:31:50 UTC (rev 12610) @@ -1,59 +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.cdi; - -import javax.enterprise.inject.spi.BeanManager; -import javax.naming.InitialContext; -import javax.naming.NamingException; - -/** - * A BeanManager provider for JNDI contexts - * - * @author Nicklas Karlsson - * - */ -public class JndiBeanManagerProvider implements BeanManagerProvider -{ - private final String location; - - public static final JndiBeanManagerProvider DEFAULT = new JndiBeanManagerProvider("java:comp/BeanManager"); - public static final JndiBeanManagerProvider JBOSS_HACK = new JndiBeanManagerProvider("java:app/BeanManager"); - - protected JndiBeanManagerProvider(final String location) - { - this.location = location; - } - - public BeanManager getBeanManager() - { - try - { - return (BeanManager) new InitialContext().lookup(location); - } - catch (NamingException e) - { - // No panic, it's just not there - } - return null; - } - -} Copied: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/cdi/JndiBeanManagerProvider.java (from rev 12574, modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/cdi/JndiBeanManagerProvider.java) =================================================================== --- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/cdi/JndiBeanManagerProvider.java (rev 0) +++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/cdi/JndiBeanManagerProvider.java 2010-04-23 16:31:50 UTC (rev 12610) @@ -0,0 +1,59 @@ +/* + * 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.cdi; + +import javax.enterprise.inject.spi.BeanManager; +import javax.naming.InitialContext; +import javax.naming.NamingException; + +/** + * A BeanManager provider for JNDI contexts + * + * @author Nicklas Karlsson + * + */ +public class JndiBeanManagerProvider implements BeanManagerProvider +{ + private final String location; + + public static final JndiBeanManagerProvider DEFAULT = new JndiBeanManagerProvider("java:comp/BeanManager"); + public static final JndiBeanManagerProvider JBOSS_HACK = new JndiBeanManagerProvider("java:app/BeanManager"); + + protected JndiBeanManagerProvider(final String location) + { + this.location = location; + } + + public BeanManager getBeanManager() + { + try + { + return (BeanManager) new InitialContext().lookup(location); + } + catch (NamingException e) + { + // No panic, it's just not there + } + return null; + } + +} Deleted: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/cdi/ServletContextBeanManagerProvider.java =================================================================== --- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/cdi/ServletContextBeanManagerProvider.java 2010-04-22 19:15:01 UTC (rev 12574) +++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/cdi/ServletContextBeanManagerProvider.java 2010-04-23 16:31:50 UTC (rev 12610) @@ -1,45 +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.cdi; - -import javax.enterprise.inject.spi.BeanManager; -import javax.faces.context.FacesContext; -import javax.servlet.ServletContext; - -/** - * A BeanManager provider for the Servlet Context attribute - * "javax.enterprise.inject.spi.BeanManager" - * - * @author Nicklas Karlsson - * - */ -public class ServletContextBeanManagerProvider implements BeanManagerProvider -{ - public static final ServletContextBeanManagerProvider DEFAULT = new ServletContextBeanManagerProvider(); - - public BeanManager getBeanManager() - { - ServletContext servletContext = (ServletContext) FacesContext.getCurrentInstance().getExternalContext().getContext(); - return (BeanManager) servletContext.getAttribute(BeanManager.class.getName()); - } - -} Copied: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/cdi/ServletContextBeanManagerProvider.java (from rev 12574, modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/cdi/ServletContextBeanManagerProvider.java) =================================================================== --- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/cdi/ServletContextBeanManagerProvider.java (rev 0) +++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/cdi/ServletContextBeanManagerProvider.java 2010-04-23 16:31:50 UTC (rev 12610) @@ -0,0 +1,45 @@ +/* + * 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.cdi; + +import javax.enterprise.inject.spi.BeanManager; +import javax.faces.context.FacesContext; +import javax.servlet.ServletContext; + +/** + * A BeanManager provider for the Servlet Context attribute + * "javax.enterprise.inject.spi.BeanManager" + * + * @author Nicklas Karlsson + * + */ +public class ServletContextBeanManagerProvider implements BeanManagerProvider +{ + public static final ServletContextBeanManagerProvider DEFAULT = new ServletContextBeanManagerProvider(); + + public BeanManager getBeanManager() + { + ServletContext servletContext = (ServletContext) FacesContext.getCurrentInstance().getExternalContext().getContext(); + return (BeanManager) servletContext.getAttribute(BeanManager.class.getName()); + } + +} Modified: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/DelegatingPhaseListener.java =================================================================== --- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/DelegatingPhaseListener.java 2010-04-23 15:43:07 UTC (rev 12609) +++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/DelegatingPhaseListener.java 2010-04-23 16:31:50 UTC (rev 12610) @@ -31,7 +31,7 @@ import javax.faces.event.PhaseId; import javax.faces.event.PhaseListener; -import org.jboss.weld.extensions.beanManager.BeanManagerAware; +import org.jboss.seam.faces.cdi.BeanManagerAware; /** * Provide CDI injection to PhaseListener artifacts by delegating through this Modified: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/DelegatingSystemEventListener.java =================================================================== --- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/DelegatingSystemEventListener.java 2010-04-23 15:43:07 UTC (rev 12609) +++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/DelegatingSystemEventListener.java 2010-04-23 16:31:50 UTC (rev 12610) @@ -31,7 +31,7 @@ import javax.faces.event.SystemEvent; import javax.faces.event.SystemEventListener; -import org.jboss.weld.extensions.beanManager.BeanManagerAware; +import org.jboss.seam.faces.cdi.BeanManagerAware; /** * Provide CDI injection to SystemEventListener artifacts by delegating through Modified: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/PhaseEventBridge.java =================================================================== --- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/PhaseEventBridge.java 2010-04-23 15:43:07 UTC (rev 12609) +++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/PhaseEventBridge.java 2010-04-23 16:31:50 UTC (rev 12610) @@ -31,6 +31,7 @@ import javax.faces.event.PhaseListener; import javax.inject.Inject; +import org.jboss.seam.faces.cdi.BeanManagerAware; import org.jboss.seam.faces.event.qualifier.After; import org.jboss.seam.faces.event.qualifier.ApplyRequestValues; import org.jboss.seam.faces.event.qualifier.Before; @@ -39,7 +40,6 @@ import org.jboss.seam.faces.event.qualifier.RenderResponse; import org.jboss.seam.faces.event.qualifier.RestoreView; import org.jboss.seam.faces.event.qualifier.UpdateModelValues; -import org.jboss.weld.extensions.beanManager.BeanManagerAware; import org.slf4j.Logger; /** Modified: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/SystemEventBridge.java =================================================================== --- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/SystemEventBridge.java 2010-04-23 15:43:07 UTC (rev 12609) +++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/SystemEventBridge.java 2010-04-23 16:31:50 UTC (rev 12610) @@ -36,9 +36,9 @@ import javax.faces.event.SystemEvent; import javax.faces.event.SystemEventListener; +import org.jboss.seam.faces.cdi.BeanManagerAware; import org.jboss.seam.faces.event.qualifier.Component; import org.jboss.seam.faces.event.qualifier.View; -import org.jboss.weld.extensions.beanManager.BeanManagerAware; /** * A SystemEventListener used to bridge JSF system events to the CDI event Deleted: modules/faces/trunk/impl/src/main/resources/META-INF/services/org.jboss.weld.extensions.beanManager.BeanManagerProvider =================================================================== --- modules/faces/trunk/impl/src/main/resources/META-INF/services/org.jboss.weld.extensions.beanManager.BeanManagerProvider 2010-04-23 15:43:07 UTC (rev 12609) +++ modules/faces/trunk/impl/src/main/resources/META-INF/services/org.jboss.weld.extensions.beanManager.BeanManagerProvider 2010-04-23 16:31:50 UTC (rev 12610) @@ -1 +0,0 @@ -org.jboss.seam.faces.beanManager.FacesServletContextBeanManagerProvider Modified: modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/PhaseEventBridgeTest.java =================================================================== --- modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/PhaseEventBridgeTest.java 2010-04-23 15:43:07 UTC (rev 12609) +++ modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/PhaseEventBridgeTest.java 2010-04-23 16:31:50 UTC (rev 12610) @@ -31,13 +31,13 @@ import org.jboss.arquillian.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.seam.faces.MockLogger; +import org.jboss.seam.faces.cdi.BeanManagerAware; import org.jboss.shrinkwrap.api.ArchivePaths; import org.jboss.shrinkwrap.api.Archives; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset; import org.jboss.test.faces.mock.context.MockFacesContext; import org.jboss.test.faces.mock.lifecycle.MockLifecycle; -import org.jboss.weld.extensions.beanManager.BeanManagerAware; import org.junit.Test; import org.junit.runner.RunWith; Modified: modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/SystemEventBridgeTest.java =================================================================== --- modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/SystemEventBridgeTest.java 2010-04-23 15:43:07 UTC (rev 12609) +++ modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/SystemEventBridgeTest.java 2010-04-23 16:31:50 UTC (rev 12610) @@ -47,13 +47,13 @@ import org.jboss.arquillian.api.Deployment; import org.jboss.arquillian.junit.Arquillian; +import org.jboss.seam.faces.cdi.BeanManagerAware; import org.jboss.shrinkwrap.api.ArchivePaths; import org.jboss.shrinkwrap.api.Archives; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset; import org.jboss.test.faces.mock.application.MockApplication; import org.jboss.test.faces.mock.context.MockFacesContext; -import org.jboss.weld.extensions.beanManager.BeanManagerAware; import org.junit.Test; import org.junit.runner.RunWith;