Author: struberg
Date: Wed Jul 18 19:46:15 2012
New Revision: 1363071
URL: http://svn.apache.org/viewvc?rev=1363071&view=rev
Log:
OWB-682 use CDI InterceptionType instead of our own pre-alpha one
Removed:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorType.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/AbstractInjectionTargetBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DependentScopedBeanInterceptorHandler.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorData.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/InvocationContextImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandler.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/InjectionExceptionUtils.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.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=1363071&r1=1363070&r2=1363071&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
Wed Jul 18 19:46:15 2012
@@ -61,7 +61,7 @@ import org.apache.webbeans.ejb.common.co
import org.apache.webbeans.inject.OWBInjector;
import org.apache.webbeans.intercept.InterceptorData;
import org.apache.webbeans.intercept.InterceptorDataImpl;
-import org.apache.webbeans.intercept.InterceptorType;
+import javax.enterprise.inject.spi.InterceptionType;
import org.apache.webbeans.intercept.InvocationContextImpl;
import org.apache.webbeans.logger.WebBeansLoggerFacade;
import org.apache.webbeans.proxy.JavassistProxyFactory;
@@ -213,14 +213,14 @@ public class OpenWebBeansEjbInterceptor
}
}
- public void lifecycleCommon(InvocationContext context, InterceptorType
interceptorType)
+ public void lifecycleCommon(InvocationContext context, InterceptionType
interceptionType)
{
try
{
- if ((this.contextual != null) &&
WebBeansUtil.isContainsInterceptorMethod(this.contextual.getInterceptorStack(),
interceptorType))
+ if ((this.contextual != null) &&
WebBeansUtil.isContainsInterceptorMethod(this.contextual.getInterceptorStack(),
interceptionType))
{
InvocationContextImpl impl = new
InvocationContextImpl(webBeansContext, this.contextual, context.getTarget(),
null, null,
-
webBeansContext.getInterceptorUtil().getInterceptorMethods(this.contextual.getInterceptorStack(),
interceptorType), interceptorType);
+
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()
impl.setCcKey(this.ccKey);
@@ -233,7 +233,7 @@ public class OpenWebBeansEjbInterceptor
}
catch (Exception e)
{
- logger.log(Level.SEVERE,
WebBeansLoggerFacade.constructMessage(OWBLogConst.ERROR_0008, interceptorType),
e);
+ logger.log(Level.SEVERE,
WebBeansLoggerFacade.constructMessage(OWBLogConst.ERROR_0008,
interceptionType), e);
throw new RuntimeException(e);
}
}
@@ -298,7 +298,7 @@ public class OpenWebBeansEjbInterceptor
new Object[] { this.webBeansContext.getBeanManagerImpl(),
this, this.contextual});
}
- lifecycleCommon(context, InterceptorType.POST_CONSTRUCT);
+ lifecycleCommon(context, InterceptionType.POST_CONSTRUCT);
if
(webBeansContext.getOpenWebBeansConfiguration().isUseEJBInterceptorInjection())
{
@@ -324,7 +324,7 @@ public class OpenWebBeansEjbInterceptor
public void preDestroy(InvocationContext context)
{
- lifecycleCommon(context, InterceptorType.PRE_DESTROY);
+ lifecycleCommon(context, InterceptionType.PRE_DESTROY);
if (this.injector != null)
{
@@ -564,7 +564,7 @@ public class OpenWebBeansEjbInterceptor
// If there were decorators, the DelegatHandler will handle
the ejbcontext.proceed at the top of the stack.
// If there were no decorators, we will fall off the end of
our own InvocationContext and take care of ejbcontext.proceed.
rv =
webBeansContext.getInterceptorUtil().callAroundInvokes(webBeansContext,
this.contextual, instance, (CreationalContextImpl<?>) this.cc, method,
- arguments,
webBeansContext.getInterceptorUtil().getInterceptorMethods(filteredInterceptorStack,
InterceptorType.AROUND_INVOKE),
+ arguments,
webBeansContext.getInterceptorUtil().getInterceptorMethods(filteredInterceptorStack,
InterceptionType.AROUND_INVOKE),
ejbContext, this.ccKey);
}
@@ -584,14 +584,14 @@ public class OpenWebBeansEjbInterceptor
logger.fine("OWBEI:: @AroundTimeout entry. Trying to run
Interceptors.");
}
- if ((this.contextual != null) &&
WebBeansUtil.isContainsInterceptorMethod(this.contextual.getInterceptorStack(),
InterceptorType.AROUND_TIMEOUT))
+ if ((this.contextual != null) &&
WebBeansUtil.isContainsInterceptorMethod(this.contextual.getInterceptorStack(),
InterceptionType.AROUND_TIMEOUT))
{
try
{
InvocationContextImpl impl = new
InvocationContextImpl(webBeansContext, null, context.getTarget(), null, null,
webBeansContext.getInterceptorUtil().getInterceptorMethods(this.contextual.getInterceptorStack(),
-
InterceptorType.AROUND_TIMEOUT),
-
InterceptorType.AROUND_TIMEOUT);
+ InterceptionType.AROUND_TIMEOUT),
+ InterceptionType.AROUND_TIMEOUT);
impl.setCreationalContext(this.cc);
impl.setEJBInvocationContext(context);
impl.setCcKey((Object)this.ccKey);
@@ -625,7 +625,7 @@ public class OpenWebBeansEjbInterceptor
logger.log(Level.FINE, "manager = {0} interceptor_instance = {1}
contextual = {2} ",
WebBeansLoggerFacade.args(this.webBeansContext.getBeanManagerImpl(), this,
this.contextual));
}
- lifecycleCommon(context, InterceptorType.PRE_PASSIVATE);
+ lifecycleCommon(context, InterceptionType.PRE_PASSIVATE);
}
/**
@@ -643,7 +643,7 @@ public class OpenWebBeansEjbInterceptor
WebBeansLoggerFacade.args(this.webBeansContext.getBeanManagerImpl(), this,
this.contextual));
}
- lifecycleCommon(context, InterceptorType.POST_ACTIVATE);
+ lifecycleCommon(context, InterceptionType.POST_ACTIVATE);
}
public static CreationalContext<?> getThreadCreationalContext()
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=1363071&r1=1363070&r2=1363071&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
Wed Jul 18 19:46:15 2012
@@ -47,7 +47,7 @@ import org.apache.webbeans.exception.Web
import org.apache.webbeans.inject.InjectableField;
import org.apache.webbeans.inject.InjectableMethods;
import org.apache.webbeans.intercept.InterceptorData;
-import org.apache.webbeans.intercept.InterceptorType;
+import javax.enterprise.inject.spi.InterceptionType;
import org.apache.webbeans.intercept.InvocationContextImpl;
import org.apache.webbeans.intercept.webbeans.WebBeansInterceptor;
import org.apache.webbeans.logger.WebBeansLoggerFacade;
@@ -246,12 +246,12 @@ public abstract class AbstractInjectionT
if(getWebBeansType().equals(WebBeansType.MANAGED))
{
// Call Post Construct
- if
(WebBeansUtil.isContainsInterceptorMethod(getInterceptorStack(),
InterceptorType.POST_CONSTRUCT))
+ if
(WebBeansUtil.isContainsInterceptorMethod(getInterceptorStack(),
InterceptionType.POST_CONSTRUCT))
{
InvocationContextImpl impl = new
InvocationContextImpl(getWebBeansContext(), null, instance, null, null,
getWebBeansContext().getInterceptorUtil().getInterceptorMethods(getInterceptorStack(),
-
InterceptorType.POST_CONSTRUCT),
-
InterceptorType.POST_CONSTRUCT);
+
InterceptionType.POST_CONSTRUCT),
+
InterceptionType.POST_CONSTRUCT);
impl.setCreationalContext(ownerCreationalContext);
try
{
@@ -285,12 +285,12 @@ public abstract class AbstractInjectionT
if(getWebBeansType().equals(WebBeansType.MANAGED) ||
getWebBeansType().equals(WebBeansType.DECORATOR))
{
- if
(WebBeansUtil.isContainsInterceptorMethod(getInterceptorStack(),
InterceptorType.PRE_DESTROY))
+ if
(WebBeansUtil.isContainsInterceptorMethod(getInterceptorStack(),
InterceptionType.PRE_DESTROY))
{
InvocationContextImpl impl = new
InvocationContextImpl(getWebBeansContext(), null, instance, null, null,
getWebBeansContext().getInterceptorUtil().getInterceptorMethods(getInterceptorStack(),
-
InterceptorType.PRE_DESTROY),
-
InterceptorType.PRE_DESTROY);
+
InterceptionType.PRE_DESTROY),
+
InterceptionType.PRE_DESTROY);
impl.setCreationalContext(creationalContext);
try
{
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java?rev=1363071&r1=1363070&r2=1363071&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java
Wed Jul 18 19:46:15 2012
@@ -107,7 +107,7 @@ class InstanceImpl<T> implements Instanc
Set<Bean<?>> beans = resolveBeans();
- webBeansContext.getResolutionUtil().checkResolvedBeans(beans,
ClassUtil.getClazz(injectionClazz), anns);
+ webBeansContext.getResolutionUtil().checkResolvedBeans(beans,
ClassUtil.getClazz(injectionClazz), anns, null);
BeanManagerImpl beanManager = webBeansContext.getBeanManagerImpl();
Bean<?> bean = beanManager.resolve(beans);
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DependentScopedBeanInterceptorHandler.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DependentScopedBeanInterceptorHandler.java?rev=1363071&r1=1363070&r2=1363071&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DependentScopedBeanInterceptorHandler.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DependentScopedBeanInterceptorHandler.java
Wed Jul 18 19:46:15 2012
@@ -22,6 +22,7 @@ import java.lang.reflect.Method;
import java.util.List;
import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.InterceptionType;
import org.apache.webbeans.component.OwbBean;
import org.apache.webbeans.context.creational.CreationalContextImpl;
@@ -79,7 +80,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, InterceptorType.AROUND_INVOKE);
+ InvocationContextImpl impl = new
InvocationContextImpl(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/InterceptorData.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorData.java?rev=1363071&r1=1363070&r2=1363071&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorData.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorData.java
Wed Jul 18 19:46:15 2012
@@ -108,9 +108,9 @@ public interface InterceptorData
* </ul>
* </p>
* @param interceptorMethod interceptor method
- * @param interceptorType interceptor annotation class
+ * @param interceptionType interceptor annotation class
*/
- public void setInterceptorMethod(Method interceptorMethod, Class<? extends
Annotation> interceptorType);
+ public void setInterceptorMethod(Method interceptorMethod, Class<? extends
Annotation> interceptionType);
/**
* Sets the source of the interceptor.
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=1363071&r1=1363070&r2=1363071&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
Wed Jul 18 19:46:15 2012
@@ -476,7 +476,7 @@ public final class InterceptorUtil
* @return list of interceptor
*/
@SuppressWarnings("unchecked")
- public List<InterceptorData> getInterceptorMethods(List<InterceptorData>
stack, InterceptorType type)
+ public List<InterceptorData> getInterceptorMethods(List<InterceptorData>
stack, InterceptionType type)
{
List<InterceptorData> interceptors = new ArrayList<InterceptorData>();
@@ -486,27 +486,27 @@ public final class InterceptorUtil
Method m = null;
InterceptorData data = it.next();
- if (type.equals(InterceptorType.AROUND_INVOKE))
+ if (type.equals(InterceptionType.AROUND_INVOKE))
{
m = data.getAroundInvoke();
}
- else if (type.equals(InterceptorType.AROUND_TIMEOUT))
+ else if (type.equals(InterceptionType.AROUND_TIMEOUT))
{
m = data.getAroundTimeout();
}
- else if (type.equals(InterceptorType.POST_ACTIVATE))
+ else if (type.equals(InterceptionType.POST_ACTIVATE))
{
m = data.getPostActivate();
}
- else if (type.equals(InterceptorType.POST_CONSTRUCT))
+ else if (type.equals(InterceptionType.POST_CONSTRUCT))
{
m = data.getPostConstruct();
}
- else if (type.equals(InterceptorType.PRE_DESTROY))
+ else if (type.equals(InterceptionType.PRE_DESTROY))
{
m = data.getPreDestroy();
}
- else if (type.equals(InterceptorType.PRE_PASSIVATE))
+ else if (type.equals(InterceptionType.PRE_PASSIVATE))
{
m = data.getPrePassivate();
}
@@ -579,7 +579,7 @@ public final class InterceptorUtil
Method proceed, Object[] arguments, List<InterceptorData> stack,
InvocationContext ejbInvocationContext, Object altKey) throws Exception
{
InvocationContextImpl impl = new
InvocationContextImpl(webBeansContext, bean, instance,
- proceed,
arguments, stack, InterceptorType.AROUND_INVOKE);
+ proceed,
arguments, stack, InterceptionType.AROUND_INVOKE);
if (ejbInvocationContext != null)
{
impl.setEJBInvocationContext(ejbInvocationContext);
Modified:
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/InvocationContextImpl.java?rev=1363071&r1=1363070&r2=1363071&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/InvocationContextImpl.java
Wed Jul 18 19:46:15 2012
@@ -27,6 +27,7 @@ import java.util.Map;
import javax.enterprise.context.spi.Context;
import javax.enterprise.context.spi.Contextual;
import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.InterceptionType;
import javax.interceptor.InvocationContext;
import org.apache.webbeans.component.EnterpriseBeanMarker;
@@ -56,7 +57,7 @@ public class InvocationContextImpl imple
private Object target;
/** Interceptor type */
- private InterceptorType type;
+ private InterceptionType type;
/** Used for numbering interceptors */
private int currentMethod = 1;
@@ -83,7 +84,7 @@ public class InvocationContextImpl imple
* @param type interceptor type
*/
public InvocationContextImpl(WebBeansContext webBeansContext, OwbBean<?>
bean, Object instance, Method method,
- Object[] parameters, List<InterceptorData>
datas, InterceptorType type)
+ Object[] parameters, List<InterceptorData>
datas, InterceptionType type)
{
this.webBeansContext = webBeansContext;
owbBean = bean;
@@ -173,11 +174,11 @@ public class InvocationContextImpl imple
{
try
{
- if (type.equals(InterceptorType.AROUND_INVOKE))
+ if (type.equals(InterceptionType.AROUND_INVOKE))
{
return proceedAroundInvokes(interceptorDatas);
}
- else if (type.equals(InterceptorType.AROUND_TIMEOUT))
+ else if (type.equals(InterceptionType.AROUND_TIMEOUT))
{
return proceedAroundTimeouts(interceptorDatas);
}
@@ -326,7 +327,7 @@ public class InvocationContextImpl imple
* @return final result
* @throws Exception for any exception
*/
- private Object proceedCommonAnnots(List<InterceptorData> datas,
InterceptorType type) throws Exception
+ private Object proceedCommonAnnots(List<InterceptorData> datas,
InterceptionType type) throws Exception
{
Object result = null;
@@ -335,25 +336,25 @@ public class InvocationContextImpl imple
InterceptorData intc = datas.get(currentMethod - 1);
Method commonAnnMethod = null;
- if (type.equals(InterceptorType.POST_CONSTRUCT))
+ if (type.equals(InterceptionType.POST_CONSTRUCT))
{
commonAnnMethod = intc.getPostConstruct();
}
- else if (type.equals(InterceptorType.POST_ACTIVATE))
+ else if (type.equals(InterceptionType.POST_ACTIVATE))
{
commonAnnMethod = intc.getPostActivate();
}
- else if (type.equals(InterceptorType.PRE_PASSIVATE))
+ else if (type.equals(InterceptionType.PRE_PASSIVATE))
{
commonAnnMethod = intc.getPrePassivate();
}
- else if (type.equals(InterceptorType.PRE_DESTROY))
+ else if (type.equals(InterceptionType.PRE_DESTROY))
{
commonAnnMethod = intc.getPreDestroy();
}
else
{
- throw new IllegalArgumentException("Unsupportet
InterceptorType: " + type);
+ throw new IllegalArgumentException("Unsupportet
InterceptionType: " + type);
}
if (commonAnnMethod == null)
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandler.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandler.java?rev=1363071&r1=1363070&r2=1363071&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandler.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandler.java
Wed Jul 18 19:46:15 2012
@@ -27,6 +27,7 @@ import javax.enterprise.context.spi.Cont
import javax.enterprise.context.spi.Contextual;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.UnproxyableResolutionException;
+import javax.enterprise.inject.spi.InterceptionType;
import org.apache.webbeans.component.OwbBean;
import org.apache.webbeans.context.AbstractContext;
@@ -128,7 +129,7 @@ public class NormalScopedBeanInterceptor
protected Object callAroundInvokes(Method proceed, Object[] arguments,
List<InterceptorData> stack) throws Exception
{
InvocationContextImpl impl = new
InvocationContextImpl(webBeansContext, bean, getContextualInstance(),
- proceed,
arguments, stack, InterceptorType.AROUND_INVOKE);
+ proceed,
arguments, stack, InterceptionType.AROUND_INVOKE);
impl.setCreationalContext(getContextualCreationalContext());
return impl.proceed();
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/InjectionExceptionUtils.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/InjectionExceptionUtils.java?rev=1363071&r1=1363070&r2=1363071&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/InjectionExceptionUtils.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/InjectionExceptionUtils.java
Wed Jul 18 19:46:15 2012
@@ -25,7 +25,6 @@ import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.InjectionPoint;
import javax.enterprise.inject.AmbiguousResolutionException;
import javax.enterprise.inject.UnsatisfiedResolutionException;
-import javax.enterprise.inject.ResolutionException;
import javax.enterprise.inject.UnproxyableResolutionException;
import java.util.Set;
import java.lang.annotation.Annotation;
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=1363071&r1=1363070&r2=1363071&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
Wed Jul 18 19:46:15 2012
@@ -142,7 +142,7 @@ import org.apache.webbeans.exception.inj
import org.apache.webbeans.inject.AlternativesManager;
import org.apache.webbeans.intercept.InterceptorData;
import org.apache.webbeans.intercept.InterceptorDataImpl;
-import org.apache.webbeans.intercept.InterceptorType;
+import javax.enterprise.inject.spi.InterceptionType;
import org.apache.webbeans.logger.WebBeansLoggerFacade;
import org.apache.webbeans.plugins.OpenWebBeansEjbLCAPlugin;
import org.apache.webbeans.plugins.PluginLoader;
@@ -1056,7 +1056,7 @@ public final class WebBeansUtil
* Configures the interceptor stack of the web beans component.
*
* @param interceptorClass interceptor class
- * @param interceptorType annotation type
+ * @param interceptionType annotation type
* @param definedInInterceptorClass check if annotation is defined in
* interceptor class (as opposed to bean class)
* @param definedInMethod check if the interceptor is defined in the comp.
@@ -1069,7 +1069,7 @@ public final class WebBeansUtil
*/
public void configureInterceptorMethods(Interceptor<?> webBeansInterceptor,
Class<?> interceptorClass,
- Class<? extends Annotation>
interceptorType,
+ Class<? extends Annotation>
interceptionType,
boolean definedInInterceptorClass,
boolean definedInMethod,
List<InterceptorData> stack,
@@ -1103,14 +1103,14 @@ public final class WebBeansUtil
}
}
- if (interceptorType.equals(AroundInvoke.class) ||
interceptorType.equals(AroundTimeout.class))
+ if (interceptionType.equals(AroundInvoke.class) ||
interceptionType.equals(AroundTimeout.class))
{
- method =
WebBeansUtil.checkAroundInvokeAnnotationCriterias(interceptorClass,
interceptorType);
+ method =
WebBeansUtil.checkAroundInvokeAnnotationCriterias(interceptorClass,
interceptionType);
}
- else if (interceptorType.equals(PostConstruct.class) ||
((postActivateClass != null) && (interceptorType.equals(postActivateClass)))
- || interceptorType.equals(PreDestroy.class) ||
((prePassivateClass != null) && (interceptorType.equals(prePassivateClass))))
+ else if (interceptionType.equals(PostConstruct.class) ||
((postActivateClass != null) && (interceptionType.equals(postActivateClass)))
+ || interceptionType.equals(PreDestroy.class) ||
((prePassivateClass != null) && (interceptionType.equals(prePassivateClass))))
{
- method = checkCommonAnnotationCriterias(interceptorClass,
interceptorType, definedInInterceptorClass);
+ method = checkCommonAnnotationCriterias(interceptorClass,
interceptionType, definedInInterceptorClass);
}
if (method != null)
@@ -1126,7 +1126,7 @@ public final class WebBeansUtil
intData.setInterceptorClass(interceptorClass);
}
- intData.setInterceptorMethod(method, interceptorType);
+ intData.setInterceptorMethod(method, interceptionType);
stack.add(intData);
}
@@ -1233,7 +1233,7 @@ public final class WebBeansUtil
* @param type interceptor type
* @return true if stack contains the interceptor with given type
*/
- public static boolean isContainsInterceptorMethod(List<InterceptorData>
stack, InterceptorType type)
+ public static boolean isContainsInterceptorMethod(List<InterceptorData>
stack, InterceptionType type)
{
if (stack.size() > 0)
{
@@ -1243,27 +1243,27 @@ public final class WebBeansUtil
Method m = null;
InterceptorData data = it.next();
- if (type.equals(InterceptorType.AROUND_INVOKE))
+ if (type.equals(InterceptionType.AROUND_INVOKE))
{
m = data.getAroundInvoke();
}
- else if (type.equals(InterceptorType.AROUND_TIMEOUT))
+ else if (type.equals(InterceptionType.AROUND_TIMEOUT))
{
m = data.getAroundTimeout();
}
- else if (type.equals(InterceptorType.POST_CONSTRUCT))
+ else if (type.equals(InterceptionType.POST_CONSTRUCT))
{
m = data.getPostConstruct();
}
- else if (type.equals(InterceptorType.POST_ACTIVATE))
+ else if (type.equals(InterceptionType.POST_ACTIVATE))
{
m = data.getPostActivate();
}
- else if (type.equals(InterceptorType.PRE_DESTROY))
+ else if (type.equals(InterceptionType.PRE_DESTROY))
{
m = data.getPreDestroy();
}
- else if (type.equals(InterceptorType.PRE_PASSIVATE))
+ else if (type.equals(InterceptionType.PRE_PASSIVATE))
{
m = data.getPrePassivate();
}
