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/08 00:03:18 UTC

svn commit: r1430081 - in /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans: component/ config/ container/ intercept/ intercept/custom/ intercept/webbeans/ proxy/

Author: struberg
Date: Mon Jan  7 23:03:18 2013
New Revision: 1430081

URL: http://svn.apache.org/viewvc?rev=1430081&view=rev
Log:
OWB-344 make it obvious that the old Interceptor<T> needs a boot...

Added:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptorBeanPleaseRemove.java   (contents, props changed)
      - copied, changed from r1429741, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptorBean.java
Removed:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptorBean.java
Modified:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.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/InterceptorComparator.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataComparator.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataImpl.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandlerPleaseRemove.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/WebBeansInterceptorConfig.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/custom/CustomInterceptorBean.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/ProxyFactory.java

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java?rev=1430081&r1=1430080&r2=1430081&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java Mon Jan  7 23:03:18 2013
@@ -49,7 +49,7 @@ import org.apache.webbeans.inject.Inject
 import org.apache.webbeans.intercept.InterceptorData;
 import javax.enterprise.inject.spi.InterceptionType;
 import org.apache.webbeans.intercept.InvocationContextImpl;
-import org.apache.webbeans.intercept.webbeans.WebBeansInterceptorBean;
+import org.apache.webbeans.intercept.webbeans.WebBeansInterceptorBeanPleaseRemove;
 import org.apache.webbeans.logger.WebBeansLoggerFacade;
 import org.apache.webbeans.proxy.ProxyFactory;
 import org.apache.webbeans.spi.ResourceInjectionService;
@@ -530,7 +530,7 @@ public abstract class AbstractInjectionT
             InterceptorData interceptorData = interceptorStack.get(i);
             if(interceptorData.isDefinedWithWebBeansInterceptor())
             {
-                WebBeansInterceptorBean<?> interceptor = (WebBeansInterceptorBean<?>)interceptorData.getWebBeansInterceptor();
+                WebBeansInterceptorBeanPleaseRemove<?> interceptor = (WebBeansInterceptorBeanPleaseRemove<?>)interceptorData.getWebBeansInterceptor();
                 if(!interceptor.isPassivationCapable())
                 {
                     throw new WebBeansConfigurationException(MessageFormat.format(

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=1430081&r1=1430080&r2=1430081&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  7 23:03:18 2013
@@ -61,7 +61,7 @@ import org.apache.webbeans.exception.Web
 import org.apache.webbeans.exception.WebBeansDeploymentException;
 import org.apache.webbeans.exception.WebBeansException;
 import org.apache.webbeans.exception.inject.InconsistentSpecializationException;
-import org.apache.webbeans.intercept.webbeans.WebBeansInterceptorBean;
+import org.apache.webbeans.intercept.webbeans.WebBeansInterceptorBeanPleaseRemove;
 import org.apache.webbeans.logger.WebBeansLoggerFacade;
 import org.apache.webbeans.portable.AnnotatedElementFactory;
 import org.apache.webbeans.portable.events.ProcessAnnotatedTypeImpl;
@@ -346,7 +346,7 @@ public class BeansDeployer
         List<javax.enterprise.inject.spi.Interceptor<?>> interceptors = webBeansContext.getInterceptorsManager().getInterceptors();
         for(javax.enterprise.inject.spi.Interceptor interceptor : interceptors)
         {
-            WebBeansInterceptorBean wbInt = (WebBeansInterceptorBean)interceptor;
+            WebBeansInterceptorBeanPleaseRemove wbInt = (WebBeansInterceptorBeanPleaseRemove)interceptor;
             beans.add(wbInt);
         }
         

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=1430081&r1=1430080&r2=1430081&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  7 23:03:18 2013
@@ -76,7 +76,7 @@ import org.apache.webbeans.exception.Web
 import org.apache.webbeans.exception.definition.DuplicateDefinitionException;
 import org.apache.webbeans.exception.inject.DefinitionException;
 import org.apache.webbeans.intercept.InterceptorComparator;
-import org.apache.webbeans.intercept.webbeans.WebBeansInterceptorBean;
+import org.apache.webbeans.intercept.webbeans.WebBeansInterceptorBeanPleaseRemove;
 import org.apache.webbeans.plugins.OpenWebBeansJmsPlugin;
 import org.apache.webbeans.portable.AnnotatedElementFactory;
 import org.apache.webbeans.portable.creation.InjectionTargetProducer;
@@ -436,7 +436,7 @@ public class BeanManagerImpl implements 
         List<Interceptor<?>> interceptorList = new ArrayList<Interceptor<?>>();
         while (itSet.hasNext())
         {
-            WebBeansInterceptorBean interceptor = (WebBeansInterceptorBean) itSet.next();
+            WebBeansInterceptorBeanPleaseRemove interceptor = (WebBeansInterceptorBeanPleaseRemove) itSet.next();
 
             if (interceptor.intercepts(type))
             {

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorComparator.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorComparator.java?rev=1430081&r1=1430080&r2=1430081&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorComparator.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorComparator.java Mon Jan  7 23:03:18 2013
@@ -23,7 +23,7 @@ import java.util.Comparator;
 import javax.enterprise.inject.spi.Interceptor;
 
 import org.apache.webbeans.config.WebBeansContext;
-import org.apache.webbeans.intercept.webbeans.WebBeansInterceptorBean;
+import org.apache.webbeans.intercept.webbeans.WebBeansInterceptorBeanPleaseRemove;
 
 public class InterceptorComparator<T> implements Comparator<Interceptor<T>>
 {
@@ -37,8 +37,8 @@ public class InterceptorComparator<T> im
 
     public int compare(Interceptor<T> o1, Interceptor<T> o2)
     {
-        WebBeansInterceptorBean<T> src = (WebBeansInterceptorBean<T>) o1;
-        WebBeansInterceptorBean<T> target = (WebBeansInterceptorBean<T>) o2;
+        WebBeansInterceptorBeanPleaseRemove<T> src = (WebBeansInterceptorBeanPleaseRemove<T>) o1;
+        WebBeansInterceptorBeanPleaseRemove<T> target = (WebBeansInterceptorBeanPleaseRemove<T>) o2;
 
         if (o1.equals(o2))
         {

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataComparator.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataComparator.java?rev=1430081&r1=1430080&r2=1430081&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataComparator.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataComparator.java Mon Jan  7 23:03:18 2013
@@ -21,7 +21,7 @@ package org.apache.webbeans.intercept;
 import java.util.Comparator;
 
 import org.apache.webbeans.config.WebBeansContext;
-import org.apache.webbeans.intercept.webbeans.WebBeansInterceptorBean;
+import org.apache.webbeans.intercept.webbeans.WebBeansInterceptorBeanPleaseRemove;
 
 public class InterceptorDataComparator implements Comparator<InterceptorData>
 {
@@ -44,8 +44,8 @@ public class InterceptorDataComparator i
         }
         else
         {
-            WebBeansInterceptorBean<?> interceptorFirst = (WebBeansInterceptorBean<?>) o1.getWebBeansInterceptor();
-            WebBeansInterceptorBean<?> interceptorSecond = (WebBeansInterceptorBean<?>) o2.getWebBeansInterceptor();
+            WebBeansInterceptorBeanPleaseRemove<?> interceptorFirst = (WebBeansInterceptorBeanPleaseRemove<?>) o1.getWebBeansInterceptor();
+            WebBeansInterceptorBeanPleaseRemove<?> interceptorSecond = (WebBeansInterceptorBeanPleaseRemove<?>) o2.getWebBeansInterceptor();
 
             if (interceptorFirst == null && interceptorSecond == null)
             {

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataImpl.java?rev=1430081&r1=1430080&r2=1430081&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataImpl.java Mon Jan  7 23:03:18 2013
@@ -36,7 +36,7 @@ import org.apache.webbeans.context.creat
 import org.apache.webbeans.context.creational.EjbInterceptorContext;
 import org.apache.webbeans.decorator.WebBeansDecoratorInterceptor;
 import org.apache.webbeans.inject.OWBInjector;
-import org.apache.webbeans.intercept.webbeans.WebBeansInterceptorBean;
+import org.apache.webbeans.intercept.webbeans.WebBeansInterceptorBeanPleaseRemove;
 import org.apache.webbeans.logger.WebBeansLoggerFacade;
 import org.apache.webbeans.plugins.OpenWebBeansEjbLCAPlugin;
 
@@ -426,13 +426,13 @@ public class InterceptorDataImpl impleme
             {
                 BeanManagerImpl manager = webBeansContext.getBeanManagerImpl();
 
-                WebBeansInterceptorBean<Object> actualInterceptor = (WebBeansInterceptorBean<Object>) webBeansInterceptor;
+                WebBeansInterceptorBeanPleaseRemove<Object> actualInterceptor = (WebBeansInterceptorBeanPleaseRemove<Object>) webBeansInterceptor;
                 CreationalContext<?> creationalContext = manager.createCreationalContext(webBeansInterceptor);
                 interceptor = manager.getReference(webBeansInterceptor, actualInterceptor.getBeanClass(), creationalContext);
 
                 actualInterceptor.setInjections(interceptor, creationalContext);
 
-                ownerCreationalContext.addDependent(ownerInstance, (WebBeansInterceptorBean<Object>) webBeansInterceptor, interceptor);
+                ownerCreationalContext.addDependent(ownerInstance, (WebBeansInterceptorBeanPleaseRemove<Object>) webBeansInterceptor, interceptor);
             }
             return interceptor;
         }

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandlerPleaseRemove.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandlerPleaseRemove.java?rev=1430081&r1=1430080&r2=1430081&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandlerPleaseRemove.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandlerPleaseRemove.java Mon Jan  7 23:03:18 2013
@@ -136,7 +136,7 @@ import org.apache.webbeans.util.ClassUti
  * 
  * @see WebBeansInterceptorConfig
  * @see WebBeansDecoratorConfig
- * @see org.apache.webbeans.intercept.webbeans.WebBeansInterceptorBean
+ * @see org.apache.webbeans.intercept.webbeans.WebBeansInterceptorBeanPleaseRemove
  * @see org.apache.webbeans.decorator.WebBeansDecorator
  * @see org.apache.webbeans.intercept.ejb.EJBInterceptorConfig
  *

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/WebBeansInterceptorConfig.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/WebBeansInterceptorConfig.java?rev=1430081&r1=1430080&r2=1430081&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/WebBeansInterceptorConfig.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/WebBeansInterceptorConfig.java Mon Jan  7 23:03:18 2013
@@ -24,7 +24,7 @@ import org.apache.webbeans.config.OWBLog
 import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.config.inheritance.IBeanInheritedMetaData;
 import org.apache.webbeans.exception.WebBeansConfigurationException;
-import org.apache.webbeans.intercept.webbeans.WebBeansInterceptorBean;
+import org.apache.webbeans.intercept.webbeans.WebBeansInterceptorBeanPleaseRemove;
 import org.apache.webbeans.logger.WebBeansLoggerFacade;
 import org.apache.webbeans.plugins.OpenWebBeansEjbLCAPlugin;
 import org.apache.webbeans.spi.BDABeansXmlScanner;
@@ -57,7 +57,7 @@ import java.util.logging.Logger;
  *
  * @author <a href="mailto:gurkanerdogdu@yahoo.com">Gurkan Erdogdu</a>
  * @version $Rev$ $Date$
- * @see org.apache.webbeans.intercept.webbeans.WebBeansInterceptorBean
+ * @see org.apache.webbeans.intercept.webbeans.WebBeansInterceptorBeanPleaseRemove
  */
 public final class WebBeansInterceptorConfig
 {
@@ -106,7 +106,7 @@ public final class WebBeansInterceptorCo
         {
             logger.log(Level.FINE, "Configuring interceptor class : [{0}]", delegate.getReturnType());
         }
-        WebBeansInterceptorBean<T> interceptor = new WebBeansInterceptorBean<T>(delegate);
+        WebBeansInterceptorBeanPleaseRemove<T> interceptor = new WebBeansInterceptorBeanPleaseRemove<T>(delegate);
 
         for (Annotation ann : interceptorBindingTypes)
         {
@@ -252,7 +252,7 @@ public final class WebBeansInterceptorCo
         Iterator<Interceptor<?>> it = set.iterator();
         while (it.hasNext())
         {
-            WebBeansInterceptorBean<?> interceptor = (WebBeansInterceptorBean<?>) it.next();
+            WebBeansInterceptorBeanPleaseRemove<?> interceptor = (WebBeansInterceptorBeanPleaseRemove<?>) it.next();
             AnnotatedType<?> annotatedType = interceptor.getAnnotatedType();
 
             OpenWebBeansEjbLCAPlugin ejbPlugin = webBeansContext.getPluginLoader().getEjbLCAPlugin();
@@ -361,7 +361,7 @@ public final class WebBeansInterceptorCo
 
                 while (it.hasNext())
                 {
-                    WebBeansInterceptorBean<?> interceptor = (WebBeansInterceptorBean<?>) it.next();
+                    WebBeansInterceptorBeanPleaseRemove<?> interceptor = (WebBeansInterceptorBeanPleaseRemove<?>) it.next();
 
                     AnnotatedType<?> interAnnoType = interceptor.getAnnotatedType();
                     webBeansContext.getWebBeansUtil().configureInterceptorMethods(interceptor,
@@ -405,7 +405,7 @@ public final class WebBeansInterceptorCo
 
         while (it.hasNext())
         {
-            WebBeansInterceptorBean<?> interceptor = (WebBeansInterceptorBean<?>) it.next();
+            WebBeansInterceptorBeanPleaseRemove<?> interceptor = (WebBeansInterceptorBeanPleaseRemove<?>) it.next();
 
             if (interceptor.hasBinding(bindingTypes, listAnnot))
             {

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/custom/CustomInterceptorBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/custom/CustomInterceptorBean.java?rev=1430081&r1=1430080&r2=1430081&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/custom/CustomInterceptorBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/custom/CustomInterceptorBean.java Mon Jan  7 23:03:18 2013
@@ -29,9 +29,9 @@ import javax.enterprise.inject.spi.Inter
 import javax.interceptor.InvocationContext;
 
 import org.apache.webbeans.component.AbstractInjectionTargetBean;
-import org.apache.webbeans.intercept.webbeans.WebBeansInterceptorBean;
+import org.apache.webbeans.intercept.webbeans.WebBeansInterceptorBeanPleaseRemove;
 
-public class CustomInterceptorBean<T> extends WebBeansInterceptorBean<T> implements Interceptor<T>
+public class CustomInterceptorBean<T> extends WebBeansInterceptorBeanPleaseRemove<T> implements Interceptor<T>
 {
     private Interceptor<T> actualInterceptor;
 

Copied: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptorBeanPleaseRemove.java (from r1429741, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptorBean.java)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptorBeanPleaseRemove.java?p2=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptorBeanPleaseRemove.java&p1=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptorBean.java&r1=1429741&r2=1430081&rev=1430081&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptorBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptorBeanPleaseRemove.java Mon Jan  7 23:03:18 2013
@@ -67,7 +67,7 @@ import java.util.logging.Level;
  * @version $Rev$ $Date$
  * @deprecated this should get replaced via a new version which does <b>not</b> delegate to a ManagedBean!
  */
-public class WebBeansInterceptorBean<T> extends AbstractOwbBean<T> implements OwbInterceptor<T>
+public class WebBeansInterceptorBeanPleaseRemove<T> extends AbstractOwbBean<T> implements OwbInterceptor<T>
 {
     /** InterceptorBindingTypes exist on the interceptor class */
     private Map<Class<? extends Annotation>, Annotation> interceptorBindingSet = new HashMap<Class<? extends Annotation>, Annotation>();
@@ -84,7 +84,7 @@ public class WebBeansInterceptorBean<T> 
 
     private final WebBeansContext webBeansContext;
 
-    public WebBeansInterceptorBean(AbstractInjectionTargetBean<T> delegateBean)
+    public WebBeansInterceptorBeanPleaseRemove(AbstractInjectionTargetBean<T> delegateBean)
     {
         super(WebBeansType.INTERCEPTOR,delegateBean.getReturnType(), delegateBean.getWebBeansContext());
         

Propchange: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptorBeanPleaseRemove.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/ProxyFactory.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/ProxyFactory.java?rev=1430081&r1=1430080&r2=1430081&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/ProxyFactory.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/ProxyFactory.java Mon Jan  7 23:03:18 2013
@@ -47,7 +47,7 @@ import org.apache.webbeans.intercept.Dep
 import org.apache.webbeans.intercept.InterceptorData;
 import org.apache.webbeans.intercept.InterceptorHandlerPleaseRemove;
 import org.apache.webbeans.intercept.NormalScopedBeanInterceptorHandlerRemove;
-import org.apache.webbeans.intercept.webbeans.WebBeansInterceptorBean;
+import org.apache.webbeans.intercept.webbeans.WebBeansInterceptorBeanPleaseRemove;
 import org.apache.webbeans.proxy.javassist.JavassistFactory;
 import org.apache.webbeans.util.ClassUtil;
 import org.apache.webbeans.util.WebBeansUtil;
@@ -223,7 +223,7 @@ public final class ProxyFactory
 
             result = createProxy(proxyClass);
             
-            if (!(bean instanceof WebBeansDecorator<?>) && !(bean instanceof WebBeansInterceptorBean<?>))
+            if (!(bean instanceof WebBeansDecorator<?>) && !(bean instanceof WebBeansInterceptorBeanPleaseRemove<?>))
             {
                 InterceptorHandlerPleaseRemove interceptorHandler = createInterceptorHandler(bean, creationalContext);
 
@@ -413,7 +413,7 @@ public final class ProxyFactory
             }
 
             Object result = createProxy(proxyClass);
-            if (!(bean instanceof WebBeansDecorator<?>) && !(bean instanceof WebBeansInterceptorBean<?>))
+            if (!(bean instanceof WebBeansDecorator<?>) && !(bean instanceof WebBeansInterceptorBeanPleaseRemove<?>))
             {
                 setHandler(result, new DependentScopedBeanInterceptorHandlerRemove(bean, actualInstance, creastionalContext));
             }