[jboss-cvs] JBossAS SVN: r94174 - in projects/kernel/trunk: webbeans-int/src/main/java/org/jboss/kernel/webbeans/plugins/webbeans and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Sep 30 14:31:14 EDT 2009
Author: kabir.khan at jboss.com
Date: 2009-09-30 14:31:14 -0400 (Wed, 30 Sep 2009)
New Revision: 94174
Modified:
projects/kernel/trunk/aop-mc-int/src/test/java/org/jboss/test/microcontainer/support/jndi/MockJndiProvider.java
projects/kernel/trunk/webbeans-int/src/main/java/org/jboss/kernel/webbeans/plugins/webbeans/McAfterBeanDiscoveryObserver.java
projects/kernel/trunk/webbeans-int/src/main/java/org/jboss/kernel/webbeans/plugins/webbeans/WebBeansFromMcRegistry.java
projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/validateobserver/TestObserver.java
projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/wb/TestMcAfterBeanDiscoveryObserver.java
Log:
Tidy up
Modified: projects/kernel/trunk/aop-mc-int/src/test/java/org/jboss/test/microcontainer/support/jndi/MockJndiProvider.java
===================================================================
--- projects/kernel/trunk/aop-mc-int/src/test/java/org/jboss/test/microcontainer/support/jndi/MockJndiProvider.java 2009-09-30 18:28:38 UTC (rev 94173)
+++ projects/kernel/trunk/aop-mc-int/src/test/java/org/jboss/test/microcontainer/support/jndi/MockJndiProvider.java 2009-09-30 18:31:14 UTC (rev 94174)
@@ -60,6 +60,8 @@
{
try
{
+ //MarshalledObject is not parameterized on JDK 5
+ @SuppressWarnings("unchecked")
MarshalledObject mo = new MarshalledObject(obj);
bindings.put(name, mo);
}
@@ -136,6 +138,8 @@
}
public Object lookup(String name) throws NamingException
{
+ //MarshalledObject is not parameterized on JDK 5
+ @SuppressWarnings("unchecked")
MarshalledObject mo = (MarshalledObject) bindings.get(name);
Object value = null;
if( mo != null )
Modified: projects/kernel/trunk/webbeans-int/src/main/java/org/jboss/kernel/webbeans/plugins/webbeans/McAfterBeanDiscoveryObserver.java
===================================================================
--- projects/kernel/trunk/webbeans-int/src/main/java/org/jboss/kernel/webbeans/plugins/webbeans/McAfterBeanDiscoveryObserver.java 2009-09-30 18:28:38 UTC (rev 94173)
+++ projects/kernel/trunk/webbeans-int/src/main/java/org/jboss/kernel/webbeans/plugins/webbeans/McAfterBeanDiscoveryObserver.java 2009-09-30 18:31:14 UTC (rev 94174)
@@ -22,12 +22,10 @@
package org.jboss.kernel.webbeans.plugins.webbeans;
import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.AnnotatedType;
+import javax.enterprise.inject.spi.BeforeBeanDiscovery;
import javax.enterprise.inject.spi.Extension;
-import org.jboss.webbeans.beanutils.spi.Beans;
-
/**
* Web Beans extension bean to register MC beans that should be accessible from web beans
*
@@ -36,12 +34,11 @@
*/
public class McAfterBeanDiscoveryObserver implements Extension
{
- public void observe(@Observes AfterBeanDiscovery afterBeanDiscovery)
+ public void observe(@Observes BeforeBeanDiscovery event)
{
- for (Beans<?> beans : WebBeansFromMcRegistry.getBeans())
+ for (AnnotatedType<?> type : WebBeansFromMcRegistry.getTypes())
{
- for(Bean<?> bean : beans.getAllBeans())
- afterBeanDiscovery.addBean(bean);
+ event.addAnnotatedType(type);
}
}
}
Modified: projects/kernel/trunk/webbeans-int/src/main/java/org/jboss/kernel/webbeans/plugins/webbeans/WebBeansFromMcRegistry.java
===================================================================
--- projects/kernel/trunk/webbeans-int/src/main/java/org/jboss/kernel/webbeans/plugins/webbeans/WebBeansFromMcRegistry.java 2009-09-30 18:28:38 UTC (rev 94173)
+++ projects/kernel/trunk/webbeans-int/src/main/java/org/jboss/kernel/webbeans/plugins/webbeans/WebBeansFromMcRegistry.java 2009-09-30 18:31:14 UTC (rev 94174)
@@ -21,16 +21,14 @@
*/
package org.jboss.kernel.webbeans.plugins.webbeans;
-import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import javax.enterprise.inject.spi.AnnotatedType;
import org.jboss.kernel.webbeans.plugins.dependency.WebBeansKernelControllerContext;
-import org.jboss.webbeans.beanutils.spi.Beans;
-import org.jboss.webbeans.beanutils.spi.ExistingBeanDescriber;
/**
* Registry of MC beans that should be accessible from web beans
@@ -45,7 +43,7 @@
/**
* Map of context name and bean implentation of MC beans that should be accessible from web beans
*/
- private static final Map<Object, Beans<?>> beansByContext = new ConcurrentHashMap<Object, Beans<?>>();
+ private static final Map<Object, AnnotatedType<?>> typesByContext = new ConcurrentHashMap<Object, AnnotatedType<?>>();
/**
* Check if a context should be accessible from web beans, and if so register it as a web bean.
@@ -57,8 +55,7 @@
AnnotatedType<?> type = context.getAnnotatedType();
if (type != null)
{
- Beans<Object> beans = ExistingBeanDescriber.describePreinstantiatedBean((AnnotatedType<Object>)type, null, context.getManager(), context.getTarget());
- beansByContext.put(context, beans);
+ typesByContext.put(context, type);
}
}
@@ -69,15 +66,15 @@
*/
public static void unregisterBean(WebBeansKernelControllerContext context)
{
- beansByContext.remove(context);
+ typesByContext.remove(context);
}
/**
* Get a copy of all the MC beans that should be registered as web beans
*/
- public static Collection<Beans<?>> getBeans()
+ public static Collection<AnnotatedType<?>> getTypes()
{
- return new ArrayList(beansByContext.values());
+ return Collections.unmodifiableCollection(typesByContext.values());
}
}
Modified: projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/validateobserver/TestObserver.java
===================================================================
--- projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/validateobserver/TestObserver.java 2009-09-30 18:28:38 UTC (rev 94173)
+++ projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/validateobserver/TestObserver.java 2009-09-30 18:31:14 UTC (rev 94174)
@@ -22,7 +22,7 @@
package org.jboss.test.kernel.webbeans.mctowb.support.validateobserver;
import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import javax.enterprise.inject.spi.BeforeBeanDiscovery;
import javax.enterprise.inject.spi.Extension;
import org.jboss.kernel.webbeans.plugins.webbeans.McAfterBeanDiscoveryObserver;
@@ -39,9 +39,9 @@
public static boolean invoked;
@Override
- public void observe(@Observes AfterBeanDiscovery afterBeanDiscovery)
+ public void observe(@Observes BeforeBeanDiscovery event)
{
- super.observe(afterBeanDiscovery);
+ super.observe(event);
invoked = true;
}
Modified: projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/wb/TestMcAfterBeanDiscoveryObserver.java
===================================================================
--- projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/wb/TestMcAfterBeanDiscoveryObserver.java 2009-09-30 18:28:38 UTC (rev 94173)
+++ projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/wb/TestMcAfterBeanDiscoveryObserver.java 2009-09-30 18:31:14 UTC (rev 94174)
@@ -22,7 +22,7 @@
package org.jboss.test.kernel.webbeans.mctowb.support.wb;
import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import javax.enterprise.inject.spi.BeforeBeanDiscovery;
import org.jboss.kernel.webbeans.plugins.webbeans.McAfterBeanDiscoveryObserver;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -37,9 +37,9 @@
{
@Override
- public void observe(@Observes AfterBeanDiscovery afterBeanDiscovery)
+ public void observe(@Observes BeforeBeanDiscovery event)
{
- super.observe(afterBeanDiscovery);
+ super.observe(event);
}
}
More information about the jboss-cvs-commits
mailing list