openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1427506 - in /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans: component/ config/ container/ intercept/ intercept/custom/ intercept/webbeans/ portable/events/discovery/ proxy/
Date Tue, 01 Jan 2013 18:09:31 GMT
Author: struberg
Date: Tue Jan  1 18:09:30 2013
New Revision: 1427506

URL: http://svn.apache.org/viewvc?rev=1427506&view=rev
Log:
OWB-744 rename classes to reflect their Bean<T> nature

Added:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/custom/CustomInterceptorBean.java
  (contents, props changed)
      - copied, changed from r1426803, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/custom/CustomInterceptor.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptorBean.java
  (contents, props changed)
      - copied, changed from r1427158, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java
Removed:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/custom/CustomInterceptor.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.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/InterceptorHandler.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/WebBeansInterceptorConfig.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.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=1427506&r1=1427505&r2=1427506&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
Tue Jan  1 18:09:30 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.WebBeansInterceptor;
+import org.apache.webbeans.intercept.webbeans.WebBeansInterceptorBean;
 import org.apache.webbeans.logger.WebBeansLoggerFacade;
 import org.apache.webbeans.proxy.ProxyFactory;
 import org.apache.webbeans.spi.ResourceInjectionService;
@@ -615,7 +615,7 @@ public abstract class AbstractInjectionT
             InterceptorData interceptorData = interceptorStack.get(i);
             if(interceptorData.isDefinedWithWebBeansInterceptor())
             {
-                WebBeansInterceptor<?> interceptor = (WebBeansInterceptor<?>)interceptorData.getWebBeansInterceptor();
+                WebBeansInterceptorBean<?> interceptor = (WebBeansInterceptorBean<?>)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=1427506&r1=1427505&r2=1427506&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
Tue Jan  1 18:09:30 2013
@@ -63,7 +63,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.WebBeansInterceptor;
+import org.apache.webbeans.intercept.webbeans.WebBeansInterceptorBean;
 import org.apache.webbeans.logger.WebBeansLoggerFacade;
 import org.apache.webbeans.portable.AnnotatedElementFactory;
 import org.apache.webbeans.portable.events.ProcessAnnotatedTypeImpl;
@@ -349,7 +349,7 @@ public class BeansDeployer
         List<javax.enterprise.inject.spi.Interceptor<?>> interceptors = manager.getInterceptors();
         for(javax.enterprise.inject.spi.Interceptor interceptor : interceptors)
         {
-            WebBeansInterceptor wbInt = (WebBeansInterceptor)interceptor;
+            WebBeansInterceptorBean wbInt = (WebBeansInterceptorBean)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=1427506&r1=1427505&r2=1427506&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
Tue Jan  1 18:09:30 2013
@@ -78,7 +78,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.WebBeansInterceptor;
+import org.apache.webbeans.intercept.webbeans.WebBeansInterceptorBean;
 import org.apache.webbeans.plugins.OpenWebBeansJmsPlugin;
 import org.apache.webbeans.portable.AnnotatedElementFactory;
 import org.apache.webbeans.portable.creation.InjectionTargetProducer;
@@ -548,7 +548,7 @@ public class BeanManagerImpl implements 
         List<Interceptor<?>> interceptorList = new ArrayList<Interceptor<?>>();
         while (itSet.hasNext())
         {
-            WebBeansInterceptor interceptor = (WebBeansInterceptor) itSet.next();
+            WebBeansInterceptorBean interceptor = (WebBeansInterceptorBean) 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=1427506&r1=1427505&r2=1427506&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
Tue Jan  1 18:09:30 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.WebBeansInterceptor;
+import org.apache.webbeans.intercept.webbeans.WebBeansInterceptorBean;
 
 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)
     {
-        WebBeansInterceptor<T> src = (WebBeansInterceptor<T>) o1;
-        WebBeansInterceptor<T> target = (WebBeansInterceptor<T>) o2;
+        WebBeansInterceptorBean<T> src = (WebBeansInterceptorBean<T>) o1;
+        WebBeansInterceptorBean<T> target = (WebBeansInterceptorBean<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=1427506&r1=1427505&r2=1427506&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
Tue Jan  1 18:09:30 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.WebBeansInterceptor;
+import org.apache.webbeans.intercept.webbeans.WebBeansInterceptorBean;
 
 public class InterceptorDataComparator implements Comparator<InterceptorData>
 {
@@ -44,8 +44,8 @@ public class InterceptorDataComparator i
         }
         else
         {
-            WebBeansInterceptor<?> interceptorFirst = (WebBeansInterceptor<?>)
o1.getWebBeansInterceptor();
-            WebBeansInterceptor<?> interceptorSecond = (WebBeansInterceptor<?>)
o2.getWebBeansInterceptor();
+            WebBeansInterceptorBean<?> interceptorFirst = (WebBeansInterceptorBean<?>)
o1.getWebBeansInterceptor();
+            WebBeansInterceptorBean<?> interceptorSecond = (WebBeansInterceptorBean<?>)
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=1427506&r1=1427505&r2=1427506&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
Tue Jan  1 18:09:30 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.WebBeansInterceptor;
+import org.apache.webbeans.intercept.webbeans.WebBeansInterceptorBean;
 import org.apache.webbeans.logger.WebBeansLoggerFacade;
 import org.apache.webbeans.plugins.OpenWebBeansEjbLCAPlugin;
 
@@ -426,13 +426,13 @@ public class InterceptorDataImpl impleme
             {
                 BeanManagerImpl manager = webBeansContext.getBeanManagerImpl();
 
-                WebBeansInterceptor<Object> actualInterceptor = (WebBeansInterceptor<Object>)
webBeansInterceptor;
+                WebBeansInterceptorBean<Object> actualInterceptor = (WebBeansInterceptorBean<Object>)
webBeansInterceptor;
                 CreationalContext<Object> creationalContext = manager.createCreationalContext(actualInterceptor);
                 interceptor = manager.getReference(actualInterceptor, actualInterceptor.getBeanClass(),
creationalContext);
 
                 actualInterceptor.setInjections(interceptor, creationalContext);
 
-                ownerCreationalContext.addDependent(ownerInstance, (WebBeansInterceptor<Object>)
webBeansInterceptor, interceptor);
+                ownerCreationalContext.addDependent(ownerInstance, (WebBeansInterceptorBean<Object>)
webBeansInterceptor, interceptor);
             }
             return interceptor;
         }

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java?rev=1427506&r1=1427505&r2=1427506&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java
Tue Jan  1 18:09:30 2013
@@ -136,7 +136,7 @@ import org.apache.webbeans.util.ClassUti
  * 
  * @see WebBeansInterceptorConfig
  * @see WebBeansDecoratorConfig
- * @see org.apache.webbeans.intercept.webbeans.WebBeansInterceptor
+ * @see org.apache.webbeans.intercept.webbeans.WebBeansInterceptorBean
  * @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=1427506&r1=1427505&r2=1427506&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
Tue Jan  1 18:09:30 2013
@@ -25,7 +25,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.WebBeansInterceptor;
+import org.apache.webbeans.intercept.webbeans.WebBeansInterceptorBean;
 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 WebBeansInterceptor
+ * @see org.apache.webbeans.intercept.webbeans.WebBeansInterceptorBean
  */
 public final class WebBeansInterceptorConfig
 {
@@ -106,7 +106,7 @@ public final class WebBeansInterceptorCo
         {
             logger.log(Level.FINE, "Configuring interceptor class : [{0}]", delegate.getReturnType());
         }
-        WebBeansInterceptor<T> interceptor = new WebBeansInterceptor<T>(delegate);
+        WebBeansInterceptorBean<T> interceptor = new WebBeansInterceptorBean<T>(delegate);
 
         List<Annotation> anns = Arrays.asList(interceptorBindingTypes);
 
@@ -302,7 +302,7 @@ public final class WebBeansInterceptorCo
         Iterator<Interceptor<?>> it = set.iterator();
         while (it.hasNext())
         {
-            WebBeansInterceptor<?> interceptor = (WebBeansInterceptor<?>) it.next();
+            WebBeansInterceptorBean<?> interceptor = (WebBeansInterceptorBean<?>)
it.next();
             AnnotatedType<?> annotatedType = interceptor.getAnnotatedType();
 
             OpenWebBeansEjbLCAPlugin ejbPlugin = webBeansContext.getPluginLoader().getEjbLCAPlugin();
@@ -444,7 +444,7 @@ public final class WebBeansInterceptorCo
 
                 while (it.hasNext())
                 {
-                    WebBeansInterceptor<?> interceptor = (WebBeansInterceptor<?>)
it.next();
+                    WebBeansInterceptorBean<?> interceptor = (WebBeansInterceptorBean<?>)
it.next();
 
                     webBeansContext.getWebBeansUtil().configureInterceptorMethods(interceptor,
                                                                                  interceptor.getClazz(),
@@ -554,7 +554,7 @@ public final class WebBeansInterceptorCo
 
                 while (it.hasNext())
                 {
-                    WebBeansInterceptor<?> interceptor = (WebBeansInterceptor<?>)
it.next();
+                    WebBeansInterceptorBean<?> interceptor = (WebBeansInterceptorBean<?>)
it.next();
 
                     AnnotatedType<?> interAnnoType = interceptor.getAnnotatedType();
 
@@ -608,7 +608,7 @@ public final class WebBeansInterceptorCo
         Set<Interceptor<?>> set = new HashSet<Interceptor<?>>();
 
         Iterator<Interceptor<?>> it = webBeansContext.getBeanManagerImpl().getInterceptors().iterator();
-        WebBeansInterceptor<?> interceptor;
+        WebBeansInterceptorBean<?> interceptor;
 
         List<Class<? extends Annotation>> bindingTypes = new ArrayList<Class<?
extends Annotation>>();
         List<Annotation> listAnnot = new ArrayList<Annotation>();
@@ -620,7 +620,7 @@ public final class WebBeansInterceptorCo
 
         while (it.hasNext())
         {
-            interceptor = (WebBeansInterceptor<?>) it.next();
+            interceptor = (WebBeansInterceptorBean<?>) it.next();
 
             if (interceptor.hasBinding(bindingTypes, listAnnot))
             {

Copied: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/custom/CustomInterceptorBean.java
(from r1426803, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/custom/CustomInterceptor.java)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/custom/CustomInterceptorBean.java?p2=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/custom/CustomInterceptorBean.java&p1=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/custom/CustomInterceptor.java&r1=1426803&r2=1427506&rev=1427506&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/custom/CustomInterceptor.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/custom/CustomInterceptorBean.java
Tue Jan  1 18:09:30 2013
@@ -29,13 +29,13 @@ import javax.enterprise.inject.spi.Inter
 import javax.interceptor.InvocationContext;
 
 import org.apache.webbeans.component.AbstractInjectionTargetBean;
-import org.apache.webbeans.intercept.webbeans.WebBeansInterceptor;
+import org.apache.webbeans.intercept.webbeans.WebBeansInterceptorBean;
 
-public class CustomInterceptor<T> extends WebBeansInterceptor<T> implements Interceptor<T>
+public class CustomInterceptorBean<T> extends WebBeansInterceptorBean<T> implements
Interceptor<T>
 {
     private Interceptor<T> actualInterceptor;
 
-    public CustomInterceptor(AbstractInjectionTargetBean<T> delegateBean, Interceptor<T>
actualInterceptor)
+    public CustomInterceptorBean(AbstractInjectionTargetBean<T> delegateBean, Interceptor<T>
actualInterceptor)
     {
         super(delegateBean);
         this.actualInterceptor = actualInterceptor;
@@ -162,7 +162,7 @@ public class CustomInterceptor<T> extend
         {
             return false;
         }
-        CustomInterceptor other = (CustomInterceptor) obj;
+        CustomInterceptorBean other = (CustomInterceptorBean) obj;
         if (actualInterceptor == null)
         {
             if (other.actualInterceptor != null)

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

Copied: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptorBean.java
(from r1427158, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptorBean.java?p2=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptorBean.java&p1=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java&r1=1427158&r2=1427506&rev=1427506&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptorBean.java
Tue Jan  1 18:09:30 2013
@@ -66,7 +66,7 @@ import java.util.logging.Level;
  * 
  * @version $Rev$ $Date$
  */
-public class WebBeansInterceptor<T> extends AbstractOwbBean<T> implements OwbInterceptor<T>
+public class WebBeansInterceptorBean<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>();
@@ -78,7 +78,7 @@ public class WebBeansInterceptor<T> exte
     private AbstractInjectionTargetBean<T> delegateBean;
     private final WebBeansContext webBeansContext;
 
-    public WebBeansInterceptor(AbstractInjectionTargetBean<T> delegateBean)
+    public WebBeansInterceptorBean(AbstractInjectionTargetBean<T> delegateBean)
     {
         super(WebBeansType.INTERCEPTOR,delegateBean.getReturnType(), delegateBean.getWebBeansContext());
         

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

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java?rev=1427506&r1=1427505&r2=1427506&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java
Tue Jan  1 18:09:30 2013
@@ -34,7 +34,7 @@ import org.apache.webbeans.config.OWBLog
 import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.decorator.WebBeansDecorator;
-import org.apache.webbeans.intercept.custom.CustomInterceptor;
+import org.apache.webbeans.intercept.custom.CustomInterceptorBean;
 import org.apache.webbeans.logger.WebBeansLoggerFacade;
 import org.apache.webbeans.portable.events.generics.GProcessBean;
 import org.apache.webbeans.portable.events.generics.GProcessObservableMethod;
@@ -81,7 +81,7 @@ public class AfterBeanDiscoveryImpl impl
                 webBeansContext.getWebBeansUtil().defineManagedBeanWithoutFireEvents(
                     (AnnotatedType<?>) annotatedType);
             
-            CustomInterceptor<?> interceptor = new CustomInterceptor(managedBean, (Interceptor<?>)bean);
+            CustomInterceptorBean<?> interceptor = new CustomInterceptorBean(managedBean,
(Interceptor<?>)bean);
             if(interceptor.getScope() != Dependent.class)
             {
                 if(logger.isLoggable(Level.WARNING))

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=1427506&r1=1427505&r2=1427506&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
Tue Jan  1 18:09:30 2013
@@ -47,7 +47,7 @@ import org.apache.webbeans.intercept.Dep
 import org.apache.webbeans.intercept.InterceptorData;
 import org.apache.webbeans.intercept.InterceptorHandler;
 import org.apache.webbeans.intercept.NormalScopedBeanInterceptorHandler;
-import org.apache.webbeans.intercept.webbeans.WebBeansInterceptor;
+import org.apache.webbeans.intercept.webbeans.WebBeansInterceptorBean;
 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
WebBeansInterceptor<?>))
+            if (!(bean instanceof WebBeansDecorator<?>) && !(bean instanceof
WebBeansInterceptorBean<?>))
             {
                 InterceptorHandler interceptorHandler = createInterceptorHandler(bean, creationalContext);
 
@@ -413,7 +413,7 @@ public final class ProxyFactory
             }
 
             Object result = createProxy(proxyClass);
-            if (!(bean instanceof WebBeansDecorator<?>) && !(bean instanceof
WebBeansInterceptor<?>))
+            if (!(bean instanceof WebBeansDecorator<?>) && !(bean instanceof
WebBeansInterceptorBean<?>))
             {
                 setHandler(result, new DependentScopedBeanInterceptorHandler(bean, actualInstance,
creastionalContext));
             }



Mime
View raw message