[weld-commits] Weld SVN: r5413 - in cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions: observer and 2 other directories.
weld-commits at lists.jboss.org
weld-commits at lists.jboss.org
Sun Jan 10 11:56:40 EST 2010
Author: pete.muir at jboss.org
Date: 2010-01-10 11:56:40 -0500 (Sun, 10 Jan 2010)
New Revision: 5413
Modified:
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/ContainerEventTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/ProcessAnnotatedTypeObserver.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/ProcessBeanObserver.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/ProcessInjectionTargetObserver.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodEventTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodObserver.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessBeanObserver.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerProcessor.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java
Log:
Explicit cleanup
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/ContainerEventTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/ContainerEventTest.java 2010-01-10 16:55:26 UTC (rev 5412)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/ContainerEventTest.java 2010-01-10 16:56:40 UTC (rev 5413)
@@ -181,4 +181,5 @@
assert type.getMethods().size() == 1;
assert type.getMethods().iterator().next().isAnnotationPresent(Produces.class);
}
+
}
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/ProcessAnnotatedTypeObserver.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/ProcessAnnotatedTypeObserver.java 2010-01-10 16:55:26 UTC (rev 5412)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/ProcessAnnotatedTypeObserver.java 2010-01-10 16:56:40 UTC (rev 5413)
@@ -1,6 +1,7 @@
package org.jboss.jsr299.tck.tests.extensions.container.event;
import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.BeforeShutdown;
import javax.enterprise.inject.spi.Extension;
import javax.enterprise.inject.spi.ProcessAnnotatedType;
@@ -11,6 +12,14 @@
private static ProcessAnnotatedType<SheepInterceptor> sessionBeanInterceptorEvent = null;
private static ProcessAnnotatedType<Farm> managedBeanEvent = null;
+ public void cleanup(@Observes BeforeShutdown shutdown)
+ {
+ statefulSessionBeanEvent = null;
+ statelessSessionBeanEvent = null;
+ sessionBeanInterceptorEvent = null;
+ managedBeanEvent = null;
+ }
+
public void observeStatelessSessionBean(@Observes ProcessAnnotatedType<Sheep> event) {
statelessSessionBeanEvent = event;
}
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/ProcessBeanObserver.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/ProcessBeanObserver.java 2010-01-10 16:55:26 UTC (rev 5412)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/ProcessBeanObserver.java 2010-01-10 16:56:40 UTC (rev 5413)
@@ -1,6 +1,7 @@
package org.jboss.jsr299.tck.tests.extensions.container.event;
import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.BeforeShutdown;
import javax.enterprise.inject.spi.Extension;
import javax.enterprise.inject.spi.ProcessManagedBean;
import javax.enterprise.inject.spi.ProcessProducerField;
@@ -15,6 +16,15 @@
private static ProcessProducerField<Milk, Farm> processProducerFieldEvent = null;
private static ProcessProducerMethod<Cheese, Farm> processProducerMethodEvent = null;
+ public void cleanup(@Observes BeforeShutdown shutdown)
+ {
+ processManagedBeanEvent = null;
+ processStatefulSessionBeanEvent = null;
+ processStatelessSessionBeanEvent = null;
+ processProducerFieldEvent = null;
+ processProducerMethodEvent = null;
+ }
+
public void observeProcessManagedBean(@Observes ProcessManagedBean<Farm> event) {
processManagedBeanEvent = event;
}
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/ProcessInjectionTargetObserver.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/ProcessInjectionTargetObserver.java 2010-01-10 16:55:26 UTC (rev 5412)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/ProcessInjectionTargetObserver.java 2010-01-10 16:56:40 UTC (rev 5413)
@@ -1,6 +1,7 @@
package org.jboss.jsr299.tck.tests.extensions.container.event;
import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.BeforeShutdown;
import javax.enterprise.inject.spi.Extension;
import javax.enterprise.inject.spi.ProcessInjectionTarget;
@@ -17,6 +18,15 @@
private static int event3Observed = 0;
private static int event4Observed = 0;
private static int event5Observed = 0;
+
+ public void cleanup(@Observes BeforeShutdown shutdown)
+ {
+ statefulSessionBeanEvent = null;
+ statelessSessionBeanEvent = null;
+ sessionBeanInterceptorEvent = null;
+ managedBeanEvent = null;
+ eventWithTypeVariable = null;
+ }
public void observeStatelessSessionBean(@Observes ProcessInjectionTarget<Sheep> event) {
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodEventTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodEventTest.java 2010-01-10 16:55:26 UTC (rev 5412)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodEventTest.java 2010-01-10 16:56:40 UTC (rev 5413)
@@ -60,4 +60,5 @@
{
assert ProcessObserverMethodObserver.getObserverMethod().getObservedType().equals(EventA.class);
}
+
}
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodObserver.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodObserver.java 2010-01-10 16:55:26 UTC (rev 5412)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodObserver.java 2010-01-10 16:56:40 UTC (rev 5413)
@@ -5,6 +5,7 @@
import javax.enterprise.event.Observes;
import javax.enterprise.inject.spi.AnnotatedMethod;
+import javax.enterprise.inject.spi.BeforeShutdown;
import javax.enterprise.inject.spi.Extension;
import javax.enterprise.inject.spi.ObserverMethod;
import javax.enterprise.inject.spi.ProcessObserverMethod;
@@ -15,6 +16,12 @@
private static AnnotatedMethod<?> annotatedMethod;
private static ObserverMethod<?> observerMethod;
+ public void cleanup(@Observes BeforeShutdown shutdown)
+ {
+ annotatedMethod = null;
+ observerMethod = null;
+ }
+
public void observeObserverMethodForEventA(@Observes ProcessObserverMethod<EventA, EventAObserver> event)
{
eventTypes.add(event.getObserverMethod().getObservedType());
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessBeanObserver.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessBeanObserver.java 2010-01-10 16:55:26 UTC (rev 5412)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessBeanObserver.java 2010-01-10 16:56:40 UTC (rev 5413)
@@ -1,6 +1,7 @@
package org.jboss.jsr299.tck.tests.extensions.processBean;
import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.BeforeShutdown;
import javax.enterprise.inject.spi.Extension;
import javax.enterprise.inject.spi.ProcessBean;
import javax.enterprise.inject.spi.ProcessManagedBean;
@@ -20,6 +21,14 @@
private static int elephantProcessBeanCount;
private static ProcessProducerField<ChickenHutch, Chicken> chickenProcessProducerField;
private static int chickenHutchProcessBeanCount;
+
+ public void cleanup(@Observes BeforeShutdown shutdown)
+ {
+ catProcessManagedBean = null;
+ cowProcessProducerMethod = null;
+ elephantProcessSessionBean = null;
+ chickenProcessProducerField = null;
+ }
public void observeCatManagedBean(@Observes ProcessManagedBean<Cat> event)
{
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerProcessor.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerProcessor.java 2010-01-10 16:55:26 UTC (rev 5412)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerProcessor.java 2010-01-10 16:56:40 UTC (rev 5413)
@@ -7,6 +7,7 @@
import javax.enterprise.inject.spi.AnnotatedField;
import javax.enterprise.inject.spi.AnnotatedMethod;
import javax.enterprise.inject.spi.AnnotatedType;
+import javax.enterprise.inject.spi.BeforeShutdown;
import javax.enterprise.inject.spi.Extension;
import javax.enterprise.inject.spi.InjectionPoint;
import javax.enterprise.inject.spi.InjectionTarget;
@@ -22,6 +23,15 @@
private static InjectionTarget<Dog> dogInjectionTarget;
private static AnnotatedType<Dog> dogAnnotatedType;
private static boolean overriddenCowProducerCalled;
+
+ public void cleanup(@Observes BeforeShutdown shutdown)
+ {
+ catInjectionTarget = null;
+ noisyDogProducer = null;
+ quietDogProducer = null;
+ dogInjectionTarget = null;
+ dogAnnotatedType = null;
+ }
public void processDogProducerProducer(@Observes ProcessProducer<DogProducer, Dog> producerEvent)
{
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java 2010-01-10 16:55:26 UTC (rev 5412)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java 2010-01-10 16:56:40 UTC (rev 5413)
@@ -250,4 +250,5 @@
assert ProducerProcessor.getDogAnnotatedType() != null;
assert ProducerProcessor.getDogAnnotatedType().getBaseType().equals(Dog.class);
}
+
}
More information about the weld-commits
mailing list