You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2013/01/14 21:17:46 UTC
svn commit: r1433096 - in /openwebbeans/trunk:
webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/interceptor/
webbeans-impl/src/main/java/org/apache/webbeans/component/
webbeans-impl/src/main/java/org/apache/webbeans/config/
webbeans-impl/src/m...
Author: struberg
Date: Mon Jan 14 20:17:46 2013
New Revision: 1433096
URL: http://svn.apache.org/viewvc?rev=1433096&view=rev
Log:
OWB-755 deprecate more old components
Added:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImplRemove.java (contents, props changed)
- copied, changed from r1433078, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/AbstractProducerRemove.java (contents, props changed)
- copied, changed from r1433078, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/AbstractProducer.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/InjectionTargetProducerRemove.java (contents, props changed)
- copied, changed from r1433078, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/InjectionTargetProducer.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/ProducerBeansProducerRemove.java (contents, props changed)
- copied, changed from r1433078, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/ProducerBeansProducer.java
Removed:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/AbstractProducer.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/InjectionTargetProducer.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/ProducerBeansProducer.java
Modified:
openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/interceptor/OpenWebBeansEjbInterceptor.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DependentScopedBeanInterceptorHandlerRemove.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandlerRemove.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/lifecycle/inheritance/LifecycleInheritanceTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java
Modified: openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/interceptor/OpenWebBeansEjbInterceptor.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/interceptor/OpenWebBeansEjbInterceptor.java?rev=1433096&r1=1433095&r2=1433096&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/interceptor/OpenWebBeansEjbInterceptor.java (original)
+++ openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/interceptor/OpenWebBeansEjbInterceptor.java Mon Jan 14 20:17:46 2013
@@ -59,7 +59,7 @@ import org.apache.webbeans.inject.OWBInj
import org.apache.webbeans.intercept.InterceptorData;
import org.apache.webbeans.intercept.InterceptorDataImpl;
import javax.enterprise.inject.spi.InterceptionType;
-import org.apache.webbeans.intercept.InvocationContextImpl;
+import org.apache.webbeans.intercept.InvocationContextImplRemove;
import org.apache.webbeans.logger.WebBeansLoggerFacade;
import org.apache.webbeans.spi.ContextsService;
import org.apache.webbeans.util.WebBeansUtil;
@@ -211,7 +211,7 @@ public class OpenWebBeansEjbInterceptor
{
if ((this.contextual != null) && WebBeansUtil.isContainsInterceptorMethod(this.contextual.getInterceptorStack(), interceptionType))
{
- InvocationContextImpl impl = new InvocationContextImpl(webBeansContext, this.contextual, context.getTarget(), null, null,
+ InvocationContextImplRemove impl = new InvocationContextImplRemove(webBeansContext, this.contextual, context.getTarget(), null, null,
webBeansContext.getInterceptorUtil().getInterceptorMethods(this.contextual.getInterceptorStack(), interceptionType), interceptionType);
impl.setCreationalContext(this.cc);
impl.setEJBInvocationContext(context); // If the final 299 interceptor calls ic.proceed, the InvocationContext calls the ejbContext.proceed()
@@ -567,7 +567,7 @@ public class OpenWebBeansEjbInterceptor
{
try
{
- InvocationContextImpl impl = new InvocationContextImpl(webBeansContext, null, context.getTarget(), null, null,
+ InvocationContextImplRemove impl = new InvocationContextImplRemove(webBeansContext, null, context.getTarget(), null, null,
webBeansContext.getInterceptorUtil().getInterceptorMethods(this.contextual.getInterceptorStack(),
InterceptionType.AROUND_TIMEOUT),
InterceptionType.AROUND_TIMEOUT);
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java?rev=1433096&r1=1433095&r2=1433096&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java Mon Jan 14 20:17:46 2013
@@ -42,7 +42,7 @@ import org.apache.webbeans.intercept.Int
import javax.enterprise.inject.spi.InjectionTarget;
import javax.enterprise.inject.spi.InterceptionType;
-import org.apache.webbeans.intercept.InvocationContextImpl;
+import org.apache.webbeans.intercept.InvocationContextImplRemove;
import org.apache.webbeans.intercept.webbeans.WebBeansInterceptorBeanPleaseRemove;
import org.apache.webbeans.logger.WebBeansLoggerFacade;
import org.apache.webbeans.proxy.ProxyFactory;
@@ -211,7 +211,7 @@ public abstract class InjectionTargetBea
{
if (WebBeansUtil.isContainsInterceptorMethod(getInterceptorStack(), InterceptionType.PRE_DESTROY))
{
- InvocationContextImpl impl = new InvocationContextImpl(getWebBeansContext(), null, instance, null, null,
+ InvocationContextImplRemove impl = new InvocationContextImplRemove(getWebBeansContext(), null, instance, null, null,
getWebBeansContext().getInterceptorUtil().getInterceptorMethods(getInterceptorStack(),
InterceptionType.PRE_DESTROY),
InterceptionType.PRE_DESTROY);
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java?rev=1433096&r1=1433095&r2=1433096&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java Mon Jan 14 20:17:46 2013
@@ -75,7 +75,7 @@ import org.apache.webbeans.exception.Web
import org.apache.webbeans.exception.inject.InconsistentSpecializationException;
import org.apache.webbeans.logger.WebBeansLoggerFacade;
import org.apache.webbeans.portable.AnnotatedElementFactory;
-import org.apache.webbeans.portable.creation.InjectionTargetProducer;
+import org.apache.webbeans.portable.creation.InjectionTargetProducerRemove;
import org.apache.webbeans.portable.events.ProcessAnnotatedTypeImpl;
import org.apache.webbeans.portable.events.ProcessBeanImpl;
import org.apache.webbeans.portable.events.ProcessInjectionTargetImpl;
@@ -928,7 +928,7 @@ public class BeansDeployer
}
Set<ObserverMethod<?>> observerMethods = new HashSet<ObserverMethod<?>>();
- ((InjectionTargetProducer)processInjectionTargetEvent.getInjectionTarget()).setBean(bean);
+ ((InjectionTargetProducerRemove)processInjectionTargetEvent.getInjectionTarget()).setBean(bean);
if(managedBeanCreator.isEnabled())
{
observerMethods = managedBeanCreator.defineObserverMethods(bean);
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java?rev=1433096&r1=1433095&r2=1433096&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java Mon Jan 14 20:17:46 2013
@@ -78,7 +78,7 @@ import org.apache.webbeans.exception.def
import org.apache.webbeans.exception.inject.DefinitionException;
import org.apache.webbeans.plugins.OpenWebBeansJmsPlugin;
import org.apache.webbeans.portable.AnnotatedElementFactory;
-import org.apache.webbeans.portable.creation.InjectionTargetProducer;
+import org.apache.webbeans.portable.creation.InjectionTargetProducerRemove;
import org.apache.webbeans.portable.events.discovery.ErrorStack;
import org.apache.webbeans.spi.ScannerService;
import org.apache.webbeans.spi.adaptor.ELAdaptor;
@@ -936,7 +936,7 @@ public class BeanManagerImpl implements
throw new DefinitionException("Could not create InjectionTargetBean for type " + type.getJavaClass());
}
- return new InjectionTargetProducer<T>(bean);
+ return new InjectionTargetProducerRemove<T>(bean);
}
public <T> Set<ObserverMethod<? super T>> resolveObserverMethods( T event, Annotation... qualifiers )
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DependentScopedBeanInterceptorHandlerRemove.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DependentScopedBeanInterceptorHandlerRemove.java?rev=1433096&r1=1433095&r2=1433096&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DependentScopedBeanInterceptorHandlerRemove.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DependentScopedBeanInterceptorHandlerRemove.java Mon Jan 14 20:17:46 2013
@@ -86,7 +86,7 @@ public class DependentScopedBeanIntercep
*/
protected Object callAroundInvokes(Method proceed, Object[] arguments, List<InterceptorData> stack) throws Exception
{
- InvocationContextImpl impl = new InvocationContextImpl(webBeansContext, bean, actualInstance,proceed, arguments, stack, InterceptionType.AROUND_INVOKE);
+ InvocationContextImplRemove impl = new InvocationContextImplRemove(webBeansContext, bean, actualInstance,proceed, arguments, stack, InterceptionType.AROUND_INVOKE);
impl.setCreationalContext(creationalContext);
return impl.proceed();
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java?rev=1433096&r1=1433095&r2=1433096&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java Mon Jan 14 20:17:46 2013
@@ -621,7 +621,7 @@ public final class InterceptorUtil
public Object callAroundInvokes(WebBeansContext webBeansContext, InjectionTargetBean<?> bean,Object instance, CreationalContextImpl<?> creationalContext,
Method proceed, Object[] arguments, List<InterceptorData> stack, InvocationContext ejbInvocationContext, Object altKey) throws Exception
{
- InvocationContextImpl impl = new InvocationContextImpl(webBeansContext, bean, instance,
+ InvocationContextImplRemove impl = new InvocationContextImplRemove(webBeansContext, bean, instance,
proceed, arguments, stack, InterceptionType.AROUND_INVOKE);
if (ejbInvocationContext != null)
{
Copied: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImplRemove.java (from r1433078, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImplRemove.java?p2=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImplRemove.java&p1=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java&r1=1433078&r2=1433096&rev=1433096&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImplRemove.java Mon Jan 14 20:17:46 2013
@@ -38,8 +38,9 @@ import org.apache.webbeans.util.ClassUti
/**
* Implementation of the {@link InvocationContext} interface.
+ * @deprecated replaced bv {@link InterceptorInvocationContext}
*/
-public class InvocationContextImpl implements InvocationContext
+public class InvocationContextImplRemove implements InvocationContext
{
/** Context data for passing between interceptors */
private Map<String, Object> contextData = new HashMap<String, Object>();
@@ -83,8 +84,8 @@ public class InvocationContextImpl imple
* @param datas interceptor stack
* @param type interceptor type
*/
- public InvocationContextImpl(WebBeansContext webBeansContext, OwbBean<?> bean, Object instance, Method method,
- Object[] parameters, List<InterceptorData> datas, InterceptionType type)
+ public InvocationContextImplRemove(WebBeansContext webBeansContext, OwbBean<?> bean, Object instance, Method method,
+ Object[] parameters, List<InterceptorData> datas, InterceptionType type)
{
this.webBeansContext = webBeansContext;
owbBean = bean;
Propchange: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImplRemove.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandlerRemove.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandlerRemove.java?rev=1433096&r1=1433095&r2=1433096&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandlerRemove.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandlerRemove.java Mon Jan 14 20:17:46 2013
@@ -122,7 +122,7 @@ public class NormalScopedBeanInterceptor
*/
protected Object callAroundInvokes(Method proceed, Object[] arguments, List<InterceptorData> stack) throws Exception
{
- InvocationContextImpl impl = new InvocationContextImpl(webBeansContext, bean, getContextualInstance(),
+ InvocationContextImplRemove impl = new InvocationContextImplRemove(webBeansContext, bean, getContextualInstance(),
proceed, arguments, stack, InterceptionType.AROUND_INVOKE);
impl.setCreationalContext(getContextualCreationalContext());
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java?rev=1433096&r1=1433095&r2=1433096&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java Mon Jan 14 20:17:46 2013
@@ -57,28 +57,30 @@ public class InjectionTargetImpl<T> exte
/**
* If the InjectionTarget has a @PostConstruct method, <code>null</code> if not.
- * This method only gets used if the produced instance is not intercepted.
- * This method must have the signature <code>void METHOD();</code>
+ * This methods only gets used if the produced instance is not intercepted.
+ * This methods must have the signature <code>void METHOD();</code>
+ * They are ordered as <b>superclass first</b>.
*/
- private Method postConstructMethod;
+ private Method[] postConstructMethods;
/**
* If the InjectionTarget has a @PreDestroy method, <code>null</code> if not.
- * This method only gets used if the produced instance is not intercepted.
- * This method must have the signature <code>void METHOD();</code>
+ * This methods only gets used if the produced instance is not intercepted.
+ * This methods must have the signature <code>void METHOD();</code>
+ * They are ordered as <b>subclass first</b>.
*/
- private Method preDestroyMethod;
+ private Method[] preDestroyMethods;
public InjectionTargetImpl(AnnotatedType<T> annotatedType, Set<InjectionPoint> points, WebBeansContext webBeansContext,
- Method postConstructMethod, Method preDestroyMethod)
+ Method[] postConstructMethods, Method[] preDestroyMethods)
{
super(points);
Asserts.assertNotNull(annotatedType);
Asserts.assertNotNull(webBeansContext);
type = annotatedType;
context = webBeansContext;
- this.postConstructMethod = postConstructMethod;
- this.preDestroyMethod = preDestroyMethod;
+ this.postConstructMethods = postConstructMethods;
+ this.preDestroyMethods = preDestroyMethods;
}
@Override
@@ -162,15 +164,18 @@ public class InjectionTargetImpl<T> exte
@Override
public void postConstruct(T instance)
{
- if (postConstructMethod != null)
+ if (postConstructMethods != null)
{
try
{
- if (!postConstructMethod.isAccessible())
+ for (Method m : postConstructMethods)
{
- postConstructMethod.setAccessible(true);
+ if (!m.isAccessible())
+ {
+ m.setAccessible(true);
+ }
+ m.invoke(instance);
}
- postConstructMethod.invoke(instance);
}
catch (Exception e)
{
@@ -186,15 +191,18 @@ public class InjectionTargetImpl<T> exte
@Override
public void preDestroy(T instance)
{
- if (preDestroyMethod != null)
+ if (preDestroyMethods != null)
{
try
{
- if (!preDestroyMethod.isAccessible())
+ for (Method m : preDestroyMethods)
{
- preDestroyMethod.setAccessible(true);
+ if (!m.isAccessible())
+ {
+ m.setAccessible(true);
+ }
+ m.invoke(instance);
}
- preDestroyMethod.invoke(instance);
}
catch (Exception e)
{
Copied: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/AbstractProducerRemove.java (from r1433078, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/AbstractProducer.java)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/AbstractProducerRemove.java?p2=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/AbstractProducerRemove.java&p1=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/AbstractProducer.java&r1=1433078&r2=1433096&rev=1433096&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/AbstractProducer.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/AbstractProducerRemove.java Mon Jan 14 20:17:46 2013
@@ -33,8 +33,9 @@ import org.apache.webbeans.context.creat
* @version $Rev$ $Date$
*
* @param <T> bean type info
+ * @deprecated the indirection to the bean is just wrong
*/
-public abstract class AbstractProducer<T> implements Producer<T>
+public abstract class AbstractProducerRemove<T> implements Producer<T>
{
/**Bean instance*/
protected OwbBean<T> bean;
@@ -50,7 +51,7 @@ public abstract class AbstractProducer<T
*
* @param bean bean instance
*/
- protected AbstractProducer(OwbBean<T> bean)
+ protected AbstractProducerRemove(OwbBean<T> bean)
{
this.bean = bean;
}
Propchange: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/AbstractProducerRemove.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/AbstractProducerRemove.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/InjectionTargetProducerRemove.java (from r1433078, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/InjectionTargetProducer.java)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/InjectionTargetProducerRemove.java?p2=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/InjectionTargetProducerRemove.java&p1=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/InjectionTargetProducer.java&r1=1433078&r2=1433096&rev=1433096&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/InjectionTargetProducer.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/InjectionTargetProducerRemove.java Mon Jan 14 20:17:46 2013
@@ -34,7 +34,7 @@ import org.apache.webbeans.config.OWBLog
import org.apache.webbeans.context.creational.CreationalContextImpl;
import org.apache.webbeans.exception.WebBeansException;
import org.apache.webbeans.inject.AbstractInjectable;
-import org.apache.webbeans.intercept.InvocationContextImpl;
+import org.apache.webbeans.intercept.InvocationContextImplRemove;
import org.apache.webbeans.logger.WebBeansLoggerFacade;
import org.apache.webbeans.proxy.ProxyFactory;
import org.apache.webbeans.util.WebBeansUtil;
@@ -45,9 +45,11 @@ import org.apache.webbeans.util.WebBeans
* @version $Rev$ $Date$
*
* @param <T> bean type info
+ *
+ * @deprecated replaced by {@link org.apache.webbeans.portable.InjectionTargetImpl}
*/
@SuppressWarnings("unchecked")
-public class InjectionTargetProducer<T> extends AbstractProducer<T> implements InjectionTarget<T>
+public class InjectionTargetProducerRemove<T> extends AbstractProducerRemove<T> implements InjectionTarget<T>
{
private Logger logger;
@@ -55,7 +57,7 @@ public class InjectionTargetProducer<T>
* Creates a new injection target producer.
* @param bean injection target bean
*/
- public InjectionTargetProducer(InjectionTargetBean<T> bean)
+ public InjectionTargetProducerRemove(InjectionTargetBean<T> bean)
{
super(bean);
}
@@ -133,7 +135,7 @@ public class InjectionTargetProducer<T>
// Call Post Construct
if (WebBeansUtil.isContainsInterceptorMethod(bean.getInterceptorStack(), InterceptionType.POST_CONSTRUCT))
{
- InvocationContextImpl impl = new InvocationContextImpl(bean.getWebBeansContext(), null, instance, null, null,
+ InvocationContextImplRemove impl = new InvocationContextImplRemove(bean.getWebBeansContext(), null, instance, null, null,
bean.getWebBeansContext().getInterceptorUtil().getInterceptorMethods(bean.getInterceptorStack(),
InterceptionType.POST_CONSTRUCT),
InterceptionType.POST_CONSTRUCT);
Propchange: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/InjectionTargetProducerRemove.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/InjectionTargetProducerRemove.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/ProducerBeansProducerRemove.java (from r1433078, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/ProducerBeansProducer.java)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/ProducerBeansProducerRemove.java?p2=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/ProducerBeansProducerRemove.java&p1=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/ProducerBeansProducer.java&r1=1433078&r2=1433096&rev=1433096&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/ProducerBeansProducer.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/ProducerBeansProducerRemove.java Mon Jan 14 20:17:46 2013
@@ -26,16 +26,18 @@ import org.apache.webbeans.component.Abs
* @version $Rev$ $Date$
*
* @param <T> producer return type info
+ *
+ * @deprectated
*/
-public class ProducerBeansProducer<T> extends AbstractProducer<T>
+public class ProducerBeansProducerRemove<T> extends AbstractProducerRemove<T>
{
/**
* Creats a new producer bean producer.
*
* @param bean producer bean
*/
- public ProducerBeansProducer(AbstractProducerBean<T> bean)
+ public ProducerBeansProducerRemove(AbstractProducerBean<T> bean)
{
super(bean);
}
-}
\ No newline at end of file
+}
Propchange: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/ProducerBeansProducerRemove.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/ProducerBeansProducerRemove.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java?rev=1433096&r1=1433095&r2=1433096&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java Mon Jan 14 20:17:46 2013
@@ -128,8 +128,8 @@ import org.apache.webbeans.intercept.Int
import org.apache.webbeans.logger.WebBeansLoggerFacade;
import org.apache.webbeans.plugins.OpenWebBeansEjbLCAPlugin;
import org.apache.webbeans.plugins.PluginLoader;
-import org.apache.webbeans.portable.creation.InjectionTargetProducer;
-import org.apache.webbeans.portable.creation.ProducerBeansProducer;
+import org.apache.webbeans.portable.creation.InjectionTargetProducerRemove;
+import org.apache.webbeans.portable.creation.ProducerBeansProducerRemove;
import org.apache.webbeans.portable.events.discovery.ErrorStack;
import org.apache.webbeans.portable.events.generics.GProcessAnnotatedType;
import org.apache.webbeans.portable.events.generics.GProcessBean;
@@ -1881,7 +1881,7 @@ public final class WebBeansUtil
public <T> GProcessInjectionTarget createProcessInjectionTargetEvent(InjectionTargetBean<T> bean)
{
- InjectionTargetProducer<T> injectionTarget = new InjectionTargetProducer<T>(bean);
+ InjectionTargetProducerRemove<T> injectionTarget = new InjectionTargetProducerRemove<T>(bean);
return new GProcessInjectionTarget(injectionTarget, bean.getAnnotatedType());
}
@@ -1905,7 +1905,7 @@ public final class WebBeansUtil
public GProcessProducer fireProcessProducerEventForMethod(ProducerMethodBean<?> producerMethod, AnnotatedMethod<?> method)
{
- GProcessProducer producerEvent = new GProcessProducer(new ProducerBeansProducer(producerMethod),method);
+ GProcessProducer producerEvent = new GProcessProducer(new ProducerBeansProducerRemove(producerMethod),method);
//Fires ProcessProducer for methods
webBeansContext.getBeanManagerImpl().fireEvent(producerEvent, AnnotationUtil.EMPTY_ANNOTATION_ARRAY);
@@ -1915,7 +1915,7 @@ public final class WebBeansUtil
public GProcessProducer fireProcessProducerEventForField(ProducerFieldBean<?> producerField, AnnotatedField<?> field)
{
- GProcessProducer producerEvent = new GProcessProducer(new ProducerBeansProducer(producerField),field);
+ GProcessProducer producerEvent = new GProcessProducer(new ProducerBeansProducerRemove(producerField),field);
//Fires ProcessProducer for fields
webBeansContext.getBeanManagerImpl().fireEvent(producerEvent, AnnotationUtil.EMPTY_ANNOTATION_ARRAY);
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/lifecycle/inheritance/LifecycleInheritanceTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/lifecycle/inheritance/LifecycleInheritanceTest.java?rev=1433096&r1=1433095&r2=1433096&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/lifecycle/inheritance/LifecycleInheritanceTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/lifecycle/inheritance/LifecycleInheritanceTest.java Mon Jan 14 20:17:46 2013
@@ -28,11 +28,22 @@ import javax.enterprise.inject.spi.BeanM
import junit.framework.Assert;
import org.apache.webbeans.newtests.AbstractUnitTest;
+import org.junit.Before;
import org.junit.Test;
public class LifecycleInheritanceTest extends AbstractUnitTest
{
-
+ @Before
+ public void before()
+ {
+ SubClassBean.POST_CONSTRUCT = false;
+ SubClassBean.PRE_DESTOY = false;
+
+ SuperClassBean.POST_CONSTRUCT = false;
+ SuperClassBean.PRE_DESTOY = false;
+ }
+
+
@Test
public void testLifecycle()
{
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java?rev=1433096&r1=1433095&r2=1433096&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java Mon Jan 14 20:17:46 2013
@@ -53,8 +53,8 @@ import org.apache.webbeans.deployment.St
import org.apache.webbeans.exception.WebBeansConfigurationException;
import org.apache.webbeans.logger.WebBeansLoggerFacade;
import org.apache.webbeans.newtests.AbstractUnitTest;
-import org.apache.webbeans.portable.creation.InjectionTargetProducer;
-import org.apache.webbeans.portable.creation.ProducerBeansProducer;
+import org.apache.webbeans.portable.creation.InjectionTargetProducerRemove;
+import org.apache.webbeans.portable.creation.ProducerBeansProducerRemove;
import org.apache.webbeans.portable.events.generics.GProcessAnnotatedType;
import org.apache.webbeans.test.component.decorator.broken.DelegateAttributeIsnotInterface;
import org.apache.webbeans.test.component.decorator.broken.DelegateAttributeMustImplementAllDecoratedTypes;
@@ -535,7 +535,7 @@ public abstract class TestContext implem
managedBeanCreator.defineInjectedMethods();
managedBeanCreator.defineDisposalMethods();
ManagedBean<T> component = managedBeanCreator.getBean();
- component.setProducer(new InjectionTargetProducer(component));
+ component.setProducer(new InjectionTargetProducerRemove(component));
webBeansContext.getWebBeansUtil().setInjectionTargetBeanEnableFlag(component);
@@ -547,7 +547,7 @@ public abstract class TestContext implem
{
// add them one after the other to enable serialization handling et al
manager.addBean(producerMethod);
- producerMethod.setProducer(new ProducerBeansProducer(producerMethod));
+ producerMethod.setProducer(new ProducerBeansProducerRemove(producerMethod));
}
Set<ProducerFieldBean<?>> producerFields = managedBeanCreator.defineProducerFields(component);
@@ -555,7 +555,7 @@ public abstract class TestContext implem
{
// add them one after the other to enable serialization handling et al
manager.addBean(producerField);
- producerField.setProducer(new ProducerBeansProducer(producerField));
+ producerField.setProducer(new ProducerBeansProducerRemove(producerField));
}
managedBeanCreator.validateDisposalMethods(component);