Return-Path: X-Original-To: apmail-openwebbeans-commits-archive@www.apache.org Delivered-To: apmail-openwebbeans-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AD5CFE6D8 for ; Fri, 4 Jan 2013 22:15:27 +0000 (UTC) Received: (qmail 23389 invoked by uid 500); 4 Jan 2013 22:15:27 -0000 Delivered-To: apmail-openwebbeans-commits-archive@openwebbeans.apache.org Received: (qmail 23360 invoked by uid 500); 4 Jan 2013 22:15:27 -0000 Mailing-List: contact commits-help@openwebbeans.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openwebbeans.apache.org Delivered-To: mailing list commits@openwebbeans.apache.org Received: (qmail 23352 invoked by uid 99); 4 Jan 2013 22:15:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jan 2013 22:15:27 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jan 2013 22:15:25 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E7D8723888CD; Fri, 4 Jan 2013 22:15:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1429160 - in /openwebbeans/trunk/webbeans-impl/src: main/java/org/apache/webbeans/component/creation/ main/java/org/apache/webbeans/config/ main/java/org/apache/webbeans/container/ main/java/org/apache/webbeans/intercept/ main/java/org/apa... Date: Fri, 04 Jan 2013 22:15:05 -0000 To: commits@openwebbeans.apache.org From: struberg@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130104221505.E7D8723888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: struberg Date: Fri Jan 4 22:15:04 2013 New Revision: 1429160 URL: http://svn.apache.org/viewvc?rev=1429160&view=rev Log: OWB-749 move interceptor stuff to InterceptorManager no reason to pollute the BeanManager with everything ;) Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanCreatorImpl.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/InterceptorsManager.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/webbeans/WebBeansInterceptorBean.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/util/WebBeansUtil.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/resolution/InterceptorResolutionTest.java openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.java openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/ShoppingCardInterceptorTest.java openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/strict/XMLSpecStrictTest.java openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/newtests/interceptors/resolution/InterceptorResolutionTest.xml Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanCreatorImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanCreatorImpl.java?rev=1429160&r1=1429159&r2=1429160&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanCreatorImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanCreatorImpl.java Fri Jan 4 22:15:04 2013 @@ -297,7 +297,7 @@ public class ManagedBeanCreatorImpl e Class clazz = injectionTargetEvent.getAnnotatedType().getJavaClass(); AnnotatedType annotatedType = injectionTargetEvent.getAnnotatedType(); - if (webBeansContext.getInterceptorsManager().isInterceptorEnabled(clazz)) + if (webBeansContext.getInterceptorsManager().isInterceptorClassEnabled(clazz)) { ManagedBean component; 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=1429160&r1=1429159&r2=1429160&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 Fri Jan 4 22:15:04 2013 @@ -345,7 +345,7 @@ public class BeansDeployer beans.clear(); //Adding interceptors to validate - List> interceptors = manager.getInterceptors(); + List> interceptors = webBeansContext.getInterceptorsManager().getInterceptors(); for(javax.enterprise.inject.spi.Interceptor interceptor : interceptors) { WebBeansInterceptorBean wbInt = (WebBeansInterceptorBean)interceptor; 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=1429160&r1=1429159&r2=1429160&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 Fri Jan 4 22:15:04 2013 @@ -131,9 +131,6 @@ public class BeanManagerImpl implements /**Deployment archive beans*/ private Set> deploymentBeans = new CopyOnWriteArraySet>(); - /**Activity interceptors*/ - private List> webBeansInterceptors = new ArrayList>(); - /**Normal scoped cache proxies*/ private Map, Object> cacheProxies = new ConcurrentHashMap, Object>(); @@ -389,7 +386,7 @@ public class BeanManagerImpl implements * @param bean * @throws DefinitionException if the id is not unique. */ - protected void addPassivationInfo(OwbBean bean) throws DefinitionException + public void addPassivationInfo(OwbBean bean) throws DefinitionException { String id = bean.getId(); if(id != null) @@ -411,7 +408,8 @@ public class BeanManagerImpl implements return this; } - + + //X TODO move to InterceptorsManager public void addCustomInterceptorClass(Class clazz) { Asserts.nullCheckForClass(clazz); @@ -496,22 +494,6 @@ public class BeanManagerImpl implements return this; } - - public BeanManager addInterceptor(Interceptor interceptor) - { - webBeansInterceptors.add(interceptor); - if (interceptor instanceof OwbBean) - { - OwbBean owbBean = (OwbBean)interceptor; - if(owbBean.isPassivationCapable()) - { - addPassivationInfo((OwbBean)interceptor); - } - - } - return this; - } - /** * {@inheritDoc} */ @@ -567,11 +549,6 @@ public class BeanManagerImpl implements return deploymentBeans; } - public List> getInterceptors() - { - return webBeansInterceptors; - } - public Set> getDecorators() { return webBeansDecorators; @@ -1113,7 +1090,7 @@ public class BeanManagerImpl implements producers.clear(); passivationBeans.clear(); webBeansDecorators.clear(); - webBeansInterceptors.clear(); + webBeansContext.getInterceptorsManager().getInterceptors().clear(); } public void clearCacheProxies() 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=1429160&r1=1429159&r2=1429160&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 Fri Jan 4 22:15:04 2013 @@ -28,11 +28,11 @@ import org.apache.webbeans.intercept.web public class InterceptorComparator implements Comparator> { - private final WebBeansContext webBeansContext; + private final InterceptorsManager interceptorsManager; public InterceptorComparator(WebBeansContext webBeansContext) { - this.webBeansContext = webBeansContext; + this.interceptorsManager = webBeansContext.getInterceptorsManager(); } public int compare(Interceptor o1, Interceptor o2) @@ -49,7 +49,7 @@ public class InterceptorComparator im Class o1Clazz = src.getClazz(); Class o2Clazz = target.getClazz(); - return webBeansContext.getInterceptorsManager().compare(o1Clazz, o2Clazz); + return interceptorsManager.compare(o1Clazz, o2Clazz); } } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java?rev=1429160&r1=1429159&r2=1429160&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java Fri Jan 4 22:15:04 2013 @@ -18,12 +18,14 @@ */ package org.apache.webbeans.intercept; +import java.util.ArrayList; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import javax.enterprise.inject.spi.AnnotatedType; -import javax.interceptor.Interceptor; +import javax.enterprise.inject.spi.Interceptor; +import org.apache.webbeans.component.OwbBean; import org.apache.webbeans.config.WebBeansContext; import org.apache.webbeans.container.BeanManagerImpl; import org.apache.webbeans.exception.WebBeansConfigurationException; @@ -34,27 +36,30 @@ import org.apache.webbeans.util.Asserts; */ public class InterceptorsManager { - private List> enabledInterceptors = new CopyOnWriteArrayList>(); private final WebBeansContext webBeansContext; + private final BeanManagerImpl beanManager; - private final BeanManagerImpl manager; + private List> enabledInterceptorClasses = new CopyOnWriteArrayList>(); + + /**Active interceptors*/ + private List> webBeansInterceptors = new ArrayList>(); public InterceptorsManager(WebBeansContext webBeansContext) { this.webBeansContext = webBeansContext; - manager = webBeansContext.getBeanManagerImpl(); + beanManager = webBeansContext.getBeanManagerImpl(); } /** * Add a certain class to the enabled interceptors list. */ - public void addNewInterceptor(Class interceptorClazz) + public void addNewInterceptorClass(Class interceptorClazz) { Asserts.nullCheckForClass(interceptorClazz, "interceptorClazz can not be null"); - if (!enabledInterceptors.contains(interceptorClazz)) + if (!enabledInterceptorClasses.contains(interceptorClazz)) { - enabledInterceptors.add(interceptorClazz); + enabledInterceptorClasses.add(interceptorClazz); } } @@ -66,13 +71,13 @@ public class InterceptorsManager Asserts.assertNotNull(src, "src parameter can not be null"); Asserts.assertNotNull(target, "target parameter can not be null"); - int srcIndex = enabledInterceptors.indexOf(src); + int srcIndex = enabledInterceptorClasses.indexOf(src); if (srcIndex == -1) { throw new IllegalArgumentException(src.getName() + " is not an enabled interceptor!"); } - int targetIndex = enabledInterceptors.indexOf(target); + int targetIndex = enabledInterceptorClasses.indexOf(target); if (targetIndex == -1) { throw new IllegalArgumentException(target.getName() + " is not an enabled interceptor!"); @@ -96,21 +101,43 @@ public class InterceptorsManager /** * Check if the given interceptor class is in the list of enabled interceptors. */ - public boolean isInterceptorEnabled(Class interceptorClazz) + public boolean isInterceptorClassEnabled(Class interceptorClazz) { Asserts.nullCheckForClass(interceptorClazz, "interceptorClazz can not be null"); - return enabledInterceptors.contains(interceptorClazz); + return enabledInterceptorClasses.contains(interceptorClazz); + } + + + public void addInterceptor(Interceptor interceptor) + { + webBeansInterceptors.add(interceptor); + if (interceptor instanceof OwbBean) + { + OwbBean owbBean = (OwbBean)interceptor; + if(owbBean.isPassivationCapable()) + { + beanManager.addPassivationInfo((OwbBean)interceptor); + } + + } } - + + + public List> getInterceptors() + { + return webBeansInterceptors; + } + public void validateInterceptorClasses() { - for(Class interceptorClass : enabledInterceptors) + for(Class interceptorClass : enabledInterceptorClasses) { AnnotatedType annotatedType = webBeansContext.getAnnotatedElementFactory().newAnnotatedType(interceptorClass); // Validate decorator classes - if(!annotatedType.isAnnotationPresent(Interceptor.class) && !manager.containsCustomInterceptorClass(interceptorClass)) + if(!annotatedType.isAnnotationPresent(javax.interceptor.Interceptor.class) && + !beanManager.containsCustomInterceptorClass(interceptorClass)) { throw new WebBeansConfigurationException("Given class : " + interceptorClass + " is not a interceptor class"); } 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=1429160&r1=1429159&r2=1429160&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 Fri Jan 4 22:15:04 2013 @@ -114,7 +114,7 @@ public final class WebBeansInterceptorCo } - delegate.getWebBeansContext().getBeanManagerImpl().addInterceptor(interceptor); + delegate.getWebBeansContext().getInterceptorsManager().addInterceptor(interceptor); } @@ -390,7 +390,7 @@ public final class WebBeansInterceptorCo { Set> set = new HashSet>(); - Iterator> it = webBeansContext.getBeanManagerImpl().getInterceptors().iterator(); + Iterator> it = webBeansContext.getInterceptorsManager().getInterceptors().iterator(); WebBeansInterceptorBean interceptor; List> bindingTypes = new ArrayList>(); Modified: 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/WebBeansInterceptorBean.java?rev=1429160&r1=1429159&r2=1429160&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/WebBeansInterceptorBean.java Fri Jan 4 22:15:04 2013 @@ -65,6 +65,7 @@ import java.util.logging.Level; *

* * @version $Rev$ $Date$ + * @deprecated this should get replaced via a new version which does not delegate to a ManagedBean! */ public class WebBeansInterceptorBean extends AbstractOwbBean implements OwbInterceptor { @@ -74,8 +75,13 @@ public class WebBeansInterceptorBean /** Interceptor class */ private Class clazz; - /**Delegate Bean*/ + /** + * The Delegate Bean. + * OWB currently scans any @Interceptor class as standard bean and then 'wraps' + * it with this Bean. Imo this is wrong as an InterceptorBean has different rules alltogether. + */ private AbstractInjectionTargetBean delegateBean; + private final WebBeansContext webBeansContext; public WebBeansInterceptorBean(AbstractInjectionTargetBean delegateBean) 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=1429160&r1=1429159&r2=1429160&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 Fri Jan 4 22:15:04 2013 @@ -34,6 +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.InterceptorsManager; import org.apache.webbeans.intercept.custom.CustomInterceptorBean; import org.apache.webbeans.logger.WebBeansLoggerFacade; import org.apache.webbeans.portable.events.generics.GProcessBean; @@ -106,7 +107,8 @@ public class AfterBeanDiscoveryImpl impl } } - beanManager.addInterceptor(interceptor); + InterceptorsManager interceptorsManager = webBeansContext.getInterceptorsManager(); + interceptorsManager.addInterceptor(interceptor); webBeansContext.getBeanManagerImpl().addCustomInterceptorClass(bean.getBeanClass()); } 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=1429160&r1=1429159&r2=1429160&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 Fri Jan 4 22:15:04 2013 @@ -2576,7 +2576,7 @@ public final class WebBeansUtil { return true; } - else if(webBeansContext.getInterceptorsManager().isInterceptorEnabled(annotatedType.getJavaClass())) + else if(webBeansContext.getInterceptorsManager().isInterceptorClassEnabled(annotatedType.getJavaClass())) { return true; } @@ -2695,7 +2695,7 @@ public final class WebBeansUtil public void defineInterceptor(AnnotatedType annotatedType) { Class clazz = annotatedType.getJavaClass(); - if (webBeansContext.getInterceptorsManager().isInterceptorEnabled(clazz)) + if (webBeansContext.getInterceptorsManager().isInterceptorClassEnabled(clazz)) { ManagedBean delegate = null; Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java?rev=1429160&r1=1429159&r2=1429160&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java Fri Jan 4 22:15:04 2013 @@ -322,14 +322,14 @@ public final class WebBeansXMLConfigurat interceptorsInFile.add(clazz); boolean isBDAScanningEnabled=(scanner!=null && scanner.isBDABeansXmlScanningEnabled()); - if ((!isBDAScanningEnabled && manager.isInterceptorEnabled(clazz)) || + if ((!isBDAScanningEnabled && manager.isInterceptorClassEnabled(clazz)) || (isBDAScanningEnabled && !scanner.getBDABeansXmlScanner().addInterceptor(clazz, fileName))) { logger.warning( "Interceptor class : " + child.getTextContent().trim() + " is already defined"); } else { - manager.addNewInterceptor(clazz); + manager.addNewInterceptorClass(clazz); } } Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/resolution/InterceptorResolutionTest.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/resolution/InterceptorResolutionTest.java?rev=1429160&r1=1429159&r2=1429160&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/resolution/InterceptorResolutionTest.java (original) +++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/resolution/InterceptorResolutionTest.java Fri Jan 4 22:15:04 2013 @@ -25,6 +25,7 @@ import java.util.Collection; import org.apache.webbeans.intercept.InterceptorResolution; import org.apache.webbeans.newtests.AbstractUnitTest; import org.apache.webbeans.newtests.interceptors.factory.beans.ClassInterceptedClass; +import org.apache.webbeans.test.component.intercept.webbeans.TransactionalInterceptor; import org.apache.webbeans.test.component.intercept.webbeans.bindings.Transactional; @@ -46,8 +47,9 @@ public class InterceptorResolutionTest Collection> beanClasses = new ArrayList>(); beanClasses.add(ClassInterceptedClass.class); beanClasses.add(Transactional.class); + beanClasses.add(TransactionalInterceptor.class); - startContainer(beanClasses, null); + startContainer(beanClasses, beanXmls); InterceptorResolution ir = new InterceptorResolution(getWebBeansContext()); AnnotatedType annotatedType = getBeanManager().createAnnotatedType(ClassInterceptedClass.class); @@ -55,7 +57,7 @@ public class InterceptorResolutionTest InterceptorResolution.BeanInterceptorInfo interceptorInfo = ir.calculateInterceptorInfo(annotatedType); Assert.assertNotNull(interceptorInfo); -/*X TODO implement! +/*X Assert.assertNotNull(interceptorInfo.getInterceptors()); Assert.assertEquals(1, interceptorInfo.getInterceptors().size()); @@ -63,8 +65,6 @@ public class InterceptorResolutionTest Assert.assertNotNull(interceptorInfo.getMethodsInfo()); */ - - shutDownContainer(); } } 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=1429160&r1=1429159&r2=1429160&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 Fri Jan 4 22:15:04 2013 @@ -294,7 +294,7 @@ public abstract class TestContext implem WebBeansContext webBeansContext = WebBeansContext.getInstance(); webBeansContext.getManagedBeanConfigurator().checkManagedBeanCondition(clazz); - webBeansContext.getInterceptorsManager().addNewInterceptor(clazz); + webBeansContext.getInterceptorsManager().addNewInterceptorClass(clazz); AnnotatedType annotatedType = webBeansContext.getAnnotatedElementFactory().newAnnotatedType(clazz); webBeansContext.getInterceptorUtil().checkInterceptorConditions(annotatedType); component = webBeansContext.getManagedBeanConfigurator().define(clazz, WebBeansType.INTERCEPTOR, webBeansContext.getAnnotatedElementFactory().newAnnotatedType(clazz)); @@ -435,7 +435,7 @@ public abstract class TestContext implem */ protected void initializeInterceptorType(Class interceptorClazz) { - WebBeansContext.getInstance().getInterceptorsManager().addNewInterceptor(interceptorClazz); + WebBeansContext.getInstance().getInterceptorsManager().addNewInterceptorClass(interceptorClazz); } Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.java?rev=1429160&r1=1429159&r2=1429160&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.java (original) +++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.java Fri Jan 4 22:15:04 2013 @@ -108,12 +108,6 @@ public class MockManager implements Bean return manager.addDecorator(decorator); } - public BeanManager addInterceptor(Interceptor interceptor) - { - manager.addInterceptor(interceptor); - return this; - } - public void fireEvent(Object event, Annotation... bindings) { manager.fireEvent(event, bindings); Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/ShoppingCardInterceptorTest.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/ShoppingCardInterceptorTest.java?rev=1429160&r1=1429159&r2=1429160&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/ShoppingCardInterceptorTest.java (original) +++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/ShoppingCardInterceptorTest.java Fri Jan 4 22:15:04 2013 @@ -53,7 +53,7 @@ public class ShoppingCardInterceptorTest webBeansContext.getContextFactory().initSessionContext(null); // Interceptors must explicitly get enabled via XML. We fake this: - webBeansContext.getInterceptorsManager().addNewInterceptor(TransactionalInterceptor.class); + webBeansContext.getInterceptorsManager().addNewInterceptorClass(TransactionalInterceptor.class); defineInterceptor(TransactionalInterceptor.class); Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/strict/XMLSpecStrictTest.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/strict/XMLSpecStrictTest.java?rev=1429160&r1=1429159&r2=1429160&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/strict/XMLSpecStrictTest.java (original) +++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/strict/XMLSpecStrictTest.java Fri Jan 4 22:15:04 2013 @@ -58,7 +58,7 @@ public class XMLSpecStrictTest extends T WebBeansXMLConfigurator configurator = new WebBeansXMLConfigurator(); configurator.configureSpecSpecific(stream, "interceptors.xml"); - boolean enable = WebBeansContext.getInstance().getInterceptorsManager().isInterceptorEnabled(DummyInterceptor.class); + boolean enable = WebBeansContext.getInstance().getInterceptorsManager().isInterceptorClassEnabled(DummyInterceptor.class); Assert.assertTrue(enable); } Modified: openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/newtests/interceptors/resolution/InterceptorResolutionTest.xml URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/newtests/interceptors/resolution/InterceptorResolutionTest.xml?rev=1429160&r1=1429159&r2=1429160&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/newtests/interceptors/resolution/InterceptorResolutionTest.xml (original) +++ openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/newtests/interceptors/resolution/InterceptorResolutionTest.xml Fri Jan 4 22:15:04 2013 @@ -19,6 +19,6 @@ under the License. --> - org.apache.webbeans.test.component.intercept.webbeans.bindings.Transactional + org.apache.webbeans.test.component.intercept.webbeans.TransactionalInterceptor