[weld-commits] Weld SVN: r5374 - in java-se/trunk/src: main/java/org/jboss/weld/environment/se/threading and 2 other directories.

Author: peteroyle Date: 2010-01-03 08:02:11 -0500 (Sun, 03 Jan 2010) New Revision: 5374 Modified: java-se/trunk/src/main/java/org/jboss/weld/environment/se/WeldSEBeanRegistrant.java java-se/trunk/src/main/java/org/jboss/weld/environment/se/threading/RunnableDecorator.java java-se/trunk/src/test/java/org/jboss/weld/environment/se/test/ThreadContextTest.java java-se/trunk/src/test/resources/META-INF/beans.xml Log: WELDX-19: Disabled ThreadContext, RunnableDecorator and all associated tests until WELD-291 is fixed. Modified: java-se/trunk/src/main/java/org/jboss/weld/environment/se/WeldSEBeanRegistrant.java =================================================================== --- java-se/trunk/src/main/java/org/jboss/weld/environment/se/WeldSEBeanRegistrant.java 2009-12-30 20:50:58 UTC (rev 5373) +++ java-se/trunk/src/main/java/org/jboss/weld/environment/se/WeldSEBeanRegistrant.java 2010-01-03 13:02:11 UTC (rev 5374) @@ -43,7 +43,8 @@ event.addAnnotatedType(manager.createAnnotatedType(ParametersFactory.class)); event.addAnnotatedType(manager.createAnnotatedType(InstanceManager.class)); event.addAnnotatedType(manager.createAnnotatedType(Weld.class)); - event.addAnnotatedType(manager.createAnnotatedType(RunnableDecorator.class)); + // TODO: enable this when WELD-291 is fixed: +// event.addAnnotatedType(manager.createAnnotatedType(RunnableDecorator.class)); } public void registerWeldSEContexts(@Observes AfterBeanDiscovery event) Modified: java-se/trunk/src/main/java/org/jboss/weld/environment/se/threading/RunnableDecorator.java =================================================================== --- java-se/trunk/src/main/java/org/jboss/weld/environment/se/threading/RunnableDecorator.java 2009-12-30 20:50:58 UTC (rev 5373) +++ java-se/trunk/src/main/java/org/jboss/weld/environment/se/threading/RunnableDecorator.java 2010-01-03 13:02:11 UTC (rev 5374) @@ -18,7 +18,6 @@ import javax.decorator.Decorator; import javax.decorator.Delegate; -import javax.enterprise.inject.Any; import javax.inject.Inject; import org.jboss.weld.context.beanstore.HashMapBeanStore; import org.jboss.weld.environment.se.WeldSEBeanRegistrant; @@ -33,7 +32,7 @@ @Decorator public class RunnableDecorator implements Runnable { - @Inject @Delegate @Any Runnable runnable; + @Inject @Delegate Runnable runnable; /** * Set up the ThreadContet and delegate. Modified: java-se/trunk/src/test/java/org/jboss/weld/environment/se/test/ThreadContextTest.java =================================================================== --- java-se/trunk/src/test/java/org/jboss/weld/environment/se/test/ThreadContextTest.java 2009-12-30 20:50:58 UTC (rev 5373) +++ java-se/trunk/src/test/java/org/jboss/weld/environment/se/test/ThreadContextTest.java 2010-01-03 13:02:11 UTC (rev 5374) @@ -38,7 +38,8 @@ public static final int NUM_THREADS = 10; public static final int NUM_LOOPS = 10; - @Test + // TODO: enable this when WELD-291 is fixed: + // @Test public void testThreadContext() { WeldContainer weld = new Weld().initialize(); Modified: java-se/trunk/src/test/resources/META-INF/beans.xml =================================================================== --- java-se/trunk/src/test/resources/META-INF/beans.xml 2009-12-30 20:50:58 UTC (rev 5373) +++ java-se/trunk/src/test/resources/META-INF/beans.xml 2010-01-03 13:02:11 UTC (rev 5374) @@ -23,6 +23,8 @@ </interceptors> <decorators> <class>org.jboss.weld.environment.se.test.decorators.CarDoorAlarm</class> + <!-- TODO: enable this when WELD-291 is fixed: <class>org.jboss.weld.environment.se.threading.RunnableDecorator</class> + --> </decorators> </beans>