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/18 14:39:10 UTC
svn commit: r1435131 -
/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java
Author: struberg
Date: Fri Jan 18 13:39:10 2013
New Revision: 1435131
URL: http://svn.apache.org/viewvc?rev=1435131&view=rev
Log:
OWB-344 remove old code
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetBean.java
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=1435131&r1=1435130&r2=1435131&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 Fri Jan 18 13:39:10 2013
@@ -18,10 +18,8 @@
*/
package org.apache.webbeans.component;
-import java.io.Serializable;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
-import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@@ -29,15 +27,11 @@ import java.util.Set;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.AnnotatedType;
-import org.apache.webbeans.config.OWBLogConst;
import org.apache.webbeans.config.WebBeansContext;
-import org.apache.webbeans.exception.WebBeansConfigurationException;
import org.apache.webbeans.intercept.InterceptorData;
import javax.enterprise.inject.spi.InjectionTarget;
-import org.apache.webbeans.intercept.webbeans.WebBeansInterceptorBeanPleaseRemove;
-import org.apache.webbeans.logger.WebBeansLoggerFacade;
import org.apache.webbeans.util.Asserts;
@@ -120,52 +114,5 @@ public abstract class InjectionTargetBea
{
return annotatedType;
}
-
- /* (non-Javadoc)
- * @see org.apache.webbeans.component.AbstractOwbBean#validatePassivationDependencies()
- */
- @Override
- public void validatePassivationDependencies()
- {
- super.validatePassivationDependencies();
-
-
- for(int i = 0, size = interceptorStack.size(); i < size; i++)
- {
- InterceptorData interceptorData = interceptorStack.get(i);
- if(interceptorData.isDefinedWithWebBeansInterceptor())
- {
- WebBeansInterceptorBeanPleaseRemove<?> interceptor = (WebBeansInterceptorBeanPleaseRemove<?>)interceptorData.getWebBeansInterceptor();
- if(!interceptor.isPassivationCapable())
- {
- throw new WebBeansConfigurationException(MessageFormat.format(
- WebBeansLoggerFacade.getTokenString(OWBLogConst.EXCEPT_0016), toString()));
- }
- else
- {
- interceptor.validatePassivationDependencies();
- }
- }
- else
- {
- if(interceptorData.isDefinedInInterceptorClass())
- {
- Class<?> interceptorClass = interceptorData.getInterceptorClass();
- if(!Serializable.class.isAssignableFrom(interceptorClass))
- {
- throw new WebBeansConfigurationException(MessageFormat.format(
- WebBeansLoggerFacade.getTokenString(OWBLogConst.EXCEPT_0016), toString()));
- }
- else
- {
- if(!getWebBeansContext().getAnnotationManager().checkInjectionPointForInterceptorPassivation(interceptorClass))
- {
- throw new WebBeansConfigurationException(MessageFormat.format(
- WebBeansLoggerFacade.getTokenString(OWBLogConst.EXCEPT_0017), toString(), interceptorClass));
- }
- }
- }
- }
- }
- }
+
}