You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/06/05 10:11:51 UTC
svn commit: r1346284 - in /openejb/trunk/openejb:
container/openejb-core/src/main/java/org/apache/openejb/cdi/BeansDeployer.java
tck/cdi-embedded/src/test/resources/passing.xml
Author: rmannibucau
Date: Tue Jun 5 08:11:49 2012
New Revision: 1346284
URL: http://svn.apache.org/viewvc?rev=1346284&view=rev
Log:
updating injectiontarget in OWB if changed
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/BeansDeployer.java
openejb/trunk/openejb/tck/cdi-embedded/src/test/resources/passing.xml
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/BeansDeployer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/BeansDeployer.java?rev=1346284&r1=1346283&r2=1346284&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/BeansDeployer.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/BeansDeployer.java Tue Jun 5 08:11:49 2012
@@ -28,6 +28,7 @@ import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.inject.spi.Decorator;
import javax.enterprise.inject.spi.InjectionPoint;
+import javax.enterprise.inject.spi.InjectionTarget;
import javax.interceptor.Interceptor;
import org.apache.webbeans.annotation.AnnotationManager;
import org.apache.webbeans.component.AbstractInjectionTargetBean;
@@ -550,7 +551,12 @@ public class BeansDeployer {
}
if(processInjectionTargetEvent != null) {
- webBeansContext.getWebBeansUtil().fireProcessInjectionTargetEvent(processInjectionTargetEvent);
+ final InjectionTarget originalInjectionTarget = processInjectionTargetEvent.getInjectionTarget();
+ final InjectionTarget updatedInjectionTarget = webBeansContext.getWebBeansUtil()
+ .fireProcessInjectionTargetEvent(processInjectionTargetEvent).getInjectionTarget();
+ if (updatedInjectionTarget!= originalInjectionTarget) {
+ webBeansContext.getBeanManagerImpl().putInjectionTargetWrapper(managedBean, new InjectionTargetWrapper<T>(updatedInjectionTarget));
+ }
}
return true;
Modified: openejb/trunk/openejb/tck/cdi-embedded/src/test/resources/passing.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tck/cdi-embedded/src/test/resources/passing.xml?rev=1346284&r1=1346283&r2=1346284&view=diff
==============================================================================
--- openejb/trunk/openejb/tck/cdi-embedded/src/test/resources/passing.xml (original)
+++ openejb/trunk/openejb/tck/cdi-embedded/src/test/resources/passing.xml Tue Jun 5 08:11:49 2012
@@ -20,272 +20,7 @@
<listener class-name="org.apache.openejb.tck.cdi.embedded.RequestScopeTestListener" />
</listeners>
<test name="CDI TCK">
- <packages>
- <package name="org.jboss.jsr299.tck.tests.*"/>
- <package name="org.jboss.jsr299.tck.interceptors.tests.*"/>
- </packages>
<classes>
- <class name="org.jboss.jsr299.tck.tests.context.ContextDestroysBeansTest">
- <methods>
- <exclude name="testContextDestroysBeansWhenDestroyed"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.ContextTest">
- <methods>
- <exclude name="testBuiltInContexts"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.DestroyForSameCreationalContext2Test">
- <methods>
- <exclude name="testDestroyForSameCreationalContextOnly"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.DestroyForSameCreationalContextTest">
- <methods>
- <exclude name="testDestroyForSameCreationalContextOnly"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.DestroyedInstanceReturnedByGetTest">
- <methods>
- <exclude name="testDestroyedInstanceMustNotBeReturnedByGet"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.GetFromContextualTest">
- <methods>
- <exclude name="testGetMayNotCreateNewInstanceUnlessCreationalContextGiven"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.GetWithNoCreationalContextTest">
- <methods>
- <exclude name="testGetWithoutCreationalContextReturnsNull"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.NormalContextTest">
- <methods>
- <exclude name="testGetMayNotReturnNullUnlessContextualCreateReturnsNull"/>
- <exclude name="testGetReturnsExistingInstance"/>
- <exclude name="testGetWithCreationalContextReturnsNewInstance"/>
- <exclude name="testSameNormalScopeBeanInjectedEverywhere"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.application.ApplicationContextTest">
- <methods>
- <exclude name="testApplicationContextSharedBetweenServletRequests"/>
- <exclude name="testApplicationScopeActiveDuringDoFilterMethod"/>
- <exclude name="testApplicationScopeActiveDuringHttpSessionListenerInvocation"/>
- <exclude name="testApplicationScopeActiveDuringServiceMethod"/>
- <exclude name="testApplicationScopeActiveDuringServletContextListenerInvocation"/>
- <exclude name="testApplicationScopeActiveDuringServletRequestListenerInvocation"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest">
- <methods>
- <exclude name="testBeanWithDefaultQualifier"/>
- <exclude name="testBeanWithNameJavaxEnterpriseContextConversation"/>
- <exclude name="testBeanWithRequestScope"/>
- <exclude name="testBeginAlreadyLongRunningConversationThrowsException"/>
- <exclude name="testConversationActiveDuringNonFacesRequest"/>
- <exclude name="testConversationBeginMakesConversationLongRunning"/>
- <exclude name="testConversationEndMakesConversationTransient"/>
- <exclude name="testConversationHasDefaultTimeout"/>
- <exclude name="testConversationIdMayBeSetByApplication"/>
- <exclude name="testConversationIdMayBeSetByContainer"/>
- <exclude name="testConversationIdSetByContainerIsUnique"/>
- <exclude name="testConversationsDontCrossSessionBoundary1"/>
- <exclude name="testConversationsDontCrossSessionBoundary2"/>
- <exclude name="testEndTransientConversationThrowsException"/>
- <exclude name="testLongRunningConversationInstancesNotDestroyedAtRequestEnd"/>
- <exclude name="testSetConversationTimeoutOverride"/>
- <exclude name="testTransientConversationHasNullId"/>
- <exclude name="testTransientConversationInstancesDestroyedAtRequestEnd"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.conversation.InvalidatingSessionDestroysConversationTest">
- <methods>
- <exclude name="testInvalidatingSessionDestroysConversation"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.conversation.LongRunningConversationPropagatedByFacesContextTest">
- <methods>
- <exclude name="testConversationPropagated"/>
- <exclude name="testConversationPropagatedOverRedirect"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.conversation.ManualCidPropagationTest">
- <methods>
- <exclude name="testManualCidPropagation"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.dependent.DependentContextTest">
- <methods>
- <exclude name="testContextIsActiveWhenEvaluatingElExpression"/>
- <exclude name="testDependentsDestroyedWhenElEvaluationCompletes"/>
- <exclude name="testInstanceUsedForElEvaluationNotShared"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.passivating.PassivatingContextTest">
- <methods>
- <exclude name="testNonSerializableProducerFieldDeclaredPassivatingThrowsIllegalProductException"/>
- <exclude name="testPassivatingScopeProducerMethodReturnsUnserializableObjectNotOk"/>
- <exclude name="testPassivationOccurs"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.passivating.broken.dependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean.EnterpriseBeanWithIllegalDependencyTest">
- <methods>
- <exclude name="test"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.passivating.broken.dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean.EnterpriseBeanWithIllegalDependencyTest">
- <methods>
- <exclude name="test"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingDecorator.EnterpriseBeanWithNonPassivatingDecoratorTest">
- <methods>
- <exclude name="testEnterpriseBeanWithNonPassivatingDecoratorFails"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.request.RequestContextTest">
- <methods>
- <exclude name="testRequestScopeActiveDuringServiceMethod"/>
- <exclude name="testRequestScopeActiveDuringServletFilter"/>
- <exclude name="testRequestScopeIsDestroyedAfterServletRequest"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.session.SessionContextTest">
- <methods>
- <exclude name="testSessionContextDestroyedWhenHttpSessionInvalidated"/>
- <exclude name="testSessionContextDestroyedWhenHttpSessionTimesOut"/>
- <exclude name="testSessionContextSharedBetweenServletRequestsInSameHttpSession"/>
- <exclude name="testSessionScopeActiveDuringDoFilterMethod"/>
- <exclude name="testSessionScopeActiveDuringServiceMethod"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.deployment.packaging.bundledLibrary.LibraryInEarTest">
- <methods>
- <exclude name="test"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.deployment.packaging.bundledLibrary.LibraryInWarTest">
- <methods>
- <exclude name="test"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle.EnterpriseBeanLifecycleTest">
- <methods>
- <exclude name="testCreateSFSB"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.newBean.NewEnterpriseBeanICTest">
- <methods>
- <exclude name="testNewBeanHasNoDisposalMethods"/>
- <exclude name="testNewBeanHasNoProducerMethods"/>
- <exclude name="testNewBeanHasSameInitializers"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.remove.EnterpriseBeanRemoveMethodTest">
- <methods>
- <exclude name="testApplicationCannotCallRemoveMethodOnNonDependentScopedSessionEnterpriseBean"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.simple.lifecycle.SimpleBeanLifecycleTest">
- <methods>
- <exclude name="testSerializeSessionScoped"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.simple.newSimpleBean.NewSimpleBeanTest">
- <methods>
- <exclude name="testNewBeanHasSameConstructor"/>
- <exclude name="testNewBeanHasSameInitializers"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.simple.resource.env.EnvInjectionTest">
- <methods>
- <exclude name="testInjectionOfEnv"/>
- <exclude name="testProduceEnvProxy"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.simple.resource.persistenceContext.PersistenceContextInjectionTest">
- <methods>
- <exclude name="testBeanTypesAndBindingTypesOfPersistenceContext"/>
- <exclude name="testInjectionOfPersistenceContext"/>
- <exclude name="testInjectionOfPersistenceUnit"/>
- <exclude name="testPassivationOfPersistenceContext"/>
- <exclude name="testPassivationOfPersistenceUnit"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.simple.resource.resource.InjectionOfResourceTest">
- <methods>
- <exclude name="testInjectionOfResource"/>
- <exclude name="testPassivatingResource"/>
- <exclude name="testProduceResourceProxy"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.interceptors.definition.enterprise.nonContextualReference.SessionBeanInterceptorOnNonContextualEjbReferenceTest">
- <methods>
- <exclude name="testNonContextualSessionBeanReferenceIsIntercepted"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.lookup.circular.CircularDependencyTest">
- <methods>
- <exclude name="testCircularInjectionOnTwoNormalBeans"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.lookup.clientProxy.incontainer.ClientProxyTest">
- <methods>
- <exclude name="testInvocationIsProcessedOnCurrentInstance"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.lookup.el.ResolutionByNameTest">
- <methods>
- <exclude name="testContextCreatesNewInstanceForInjection"/>
- <exclude name="testELResolverReturnsContextualInstance"/>
- <exclude name="testQualifiedNameLookup"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.lookup.el.integration.IntegrationWithUnifiedELTest">
- <methods>
- <exclude name="testELResolverRegisteredWithJsf"/>
- <exclude name="testELResolverRegisteredWithServletContainer"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.InjectionIntoNonContextualComponentTest">
- <methods>
- <exclude name="testFilterInitializerMethodCalled"/>
- <exclude name="testInjectionIntoFilter"/>
- <exclude name="testInjectionIntoJSFManagedBean"/>
- <exclude name="testInjectionIntoServlet"/>
- <exclude name="testInjectionIntoServletListener"/>
- <exclude name="testInjectionIntoTagHandler"/>
- <exclude name="testInjectionIntoTagLibraryListener"/>
- <exclude name="testServletInitializerMethodCalled"/>
- <exclude name="testServletListenerInitializerMethodCalled"/>
- <exclude name="testTagLibraryListenerInitializerMethodCalled"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws.InjectionIntoWebServiceEndPointTest">
- <methods>
- <exclude name="testInjectionIntoWebServiceEndpoint"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.lookup.injectionpoint.broken.not.bean.InjectionPointTest">
- <methods>
- <exclude name="testDefinitionErrorDetected"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.lookup.manager.jndi.ManagerTest">
- <methods>
- <exclude name="testManagerLookupInJndi"/>
- </methods>
- </class>
-
- <!-- see CDI-140 -->
- <class
- name="org.jboss.jsr299.tck.tests.context.passivating.broken.passivatingProducerMethodWithNonPassivatingParameter.PassivatingProducerMethodWithNonPassivatingParameterTest">
- <methods>
- <exclude name="testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoProducerMethodParameterWithPassivatingScopeFails"></exclude>
- </methods>
- </class>
- </classes>
+ <class name="org.jboss.jsr299.tck.tests.extensions.producer.ProducerTest" /> </classes>
</test>
</suite>