Author: norman.richards(a)jboss.com Date: 2009-07-17 17:32:06 -0400 (Fri, 17 Jul 2009) New Revision: 11295 Modified: modules/trunk/bridge-api/src/main/java/org/jboss/seam/bridge/ManagerBridge.java modules/trunk/bridge-api/src/test/java/org/jboss/seam/bridge/ManagerBridgeOverrideTest.java modules/trunk/bridge-api/src/test/java/org/jboss/seam/bridge/ManagerBridgeTest.java modules/trunk/bridge-api/src/test/java/org/jboss/seam/bridge/stubs/IncorrectManagerProviderStub.java Log: resolve a few build issues Modified: modules/trunk/bridge-api/src/main/java/org/jboss/seam/bridge/ManagerBridge.java =================================================================== --- modules/trunk/bridge-api/src/main/java/org/jboss/seam/bridge/ManagerBridge.java 2009-07-15 12:01:38 UTC (rev 11294) +++ modules/trunk/bridge-api/src/main/java/org/jboss/seam/bridge/ManagerBridge.java 2009-07-17 21:32:06 UTC (rev 11295) @@ -2,7 +2,7 @@ import javax.enterprise.inject.spi.AfterBeanDiscovery; import javax.enterprise.inject.spi.BeanManager; -import javax.event.Observes; +import javax.enterprise.event.Observes; import org.jboss.seam.bridge.spi.ManagerProvider; import org.jboss.webbeans.log.LogProvider; @@ -89,7 +89,7 @@ * * @param manager The deployed Manager instance */ - public void onStartup(@Observes @AfterBeanDiscovery BeanManager manager) + public void onStartup(@Observes AfterBeanDiscovery event, BeanManager manager) { // intended for a mock environment, skip discovery if (!discover) Modified: modules/trunk/bridge-api/src/test/java/org/jboss/seam/bridge/ManagerBridgeOverrideTest.java =================================================================== --- modules/trunk/bridge-api/src/test/java/org/jboss/seam/bridge/ManagerBridgeOverrideTest.java 2009-07-15 12:01:38 UTC (rev 11294) +++ modules/trunk/bridge-api/src/test/java/org/jboss/seam/bridge/ManagerBridgeOverrideTest.java 2009-07-17 21:32:06 UTC (rev 11295) @@ -26,7 +26,7 @@ ManagerBridge bridge = new ManagerBridge(); // no scanning should occur; ensure by forcing NullPointerException if it does bridge.setResolverClass(null); - bridge.onStartup(null); + bridge.onStartup(null, null); assertSame(ManagerBridge.getProvider(), provider); } Modified: modules/trunk/bridge-api/src/test/java/org/jboss/seam/bridge/ManagerBridgeTest.java =================================================================== --- modules/trunk/bridge-api/src/test/java/org/jboss/seam/bridge/ManagerBridgeTest.java 2009-07-15 12:01:38 UTC (rev 11294) +++ modules/trunk/bridge-api/src/test/java/org/jboss/seam/bridge/ManagerBridgeTest.java 2009-07-17 21:32:06 UTC (rev 11295) @@ -45,7 +45,7 @@ { ManagerBridge bridge = new ManagerBridge(); bridge.setResolverClass(ManagerProviderResolverStub.class); - bridge.onStartup(getCurrentManager()); + bridge.onStartup(null, getCurrentManager()); ManagerProvider provider = ManagerBridge.getProvider(); assertTrue(provider instanceof ManagerProviderStub); assertSame(provider.getCurrentManager(), getCurrentManager()); @@ -62,7 +62,7 @@ { ManagerBridge bridge = new ManagerBridge(); bridge.setResolverClass(IncorrectManagerProviderResolverStub.class); - bridge.onStartup(getCurrentManager()); + bridge.onStartup(null, getCurrentManager()); ManagerBridge.getProvider(); } Modified: modules/trunk/bridge-api/src/test/java/org/jboss/seam/bridge/stubs/IncorrectManagerProviderStub.java =================================================================== --- modules/trunk/bridge-api/src/test/java/org/jboss/seam/bridge/stubs/IncorrectManagerProviderStub.java 2009-07-15 12:01:38 UTC (rev 11294) +++ modules/trunk/bridge-api/src/test/java/org/jboss/seam/bridge/stubs/IncorrectManagerProviderStub.java 2009-07-17 21:32:06 UTC (rev 11295) @@ -3,8 +3,8 @@ import javax.enterprise.inject.spi.BeanManager; import org.jboss.seam.bridge.spi.ManagerProvider; +import org.jboss.webbeans.BeanManagerImpl; import org.jboss.webbeans.CurrentManager; -import org.jboss.webbeans.ManagerImpl; public class IncorrectManagerProviderStub implements ManagerProvider { @@ -13,7 +13,7 @@ */ public BeanManager getCurrentManager() { - return ManagerImpl.newChildManager(CurrentManager.rootManager()); + return BeanManagerImpl.newChildManager(CurrentManager.rootManager()); } } \ No newline at end of file