svn commit: r1435607 - in /openwebbeans/trunk/webbeans-impl/src: main/java/org/apache/webbeans/config/ main/java/org/apache/webbeans/intercept/ejb/ test/java/org/apache/webbeans/test/unittests/intercept/

[st...@apache.org]

Author: struberg
Date: Sat Jan 19 17:15:51 2013
New Revision: 1435607

URL: http://svn.apache.org/viewvc?rev=1435607&view=rev
Log:
OWB-344 remove EJBInterceptorConfig

Removed:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ejb/EJBInterceptorConfig.java
Modified:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java
    openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptorExceptionComponentTest.java

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java?rev=1435607&r1=1435606&r2=1435607&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java Sat Jan 19 17:15:51 2013
@@ -40,7 +40,6 @@ import org.apache.webbeans.intercept.Int
 import org.apache.webbeans.intercept.InterceptorUtil;
 import org.apache.webbeans.intercept.InterceptorsManager;
 import org.apache.webbeans.intercept.WebBeansInterceptorConfig;
-import org.apache.webbeans.intercept.ejb.EJBInterceptorConfig;
 import org.apache.webbeans.plugins.PluginLoader;
 import org.apache.webbeans.portable.AnnotatedElementFactory;
 import org.apache.webbeans.portable.events.ExtensionLoader;
@@ -76,7 +75,6 @@ public class WebBeansContext
     private final ConversationManager conversationManager = new ConversationManager(this);
     private final CreationalContextFactory creationalContextFactory = new CreationalContextFactory(this);
     private final DecoratorsManager decoratorsManager = new DecoratorsManager(this);
-    private final EJBInterceptorConfig ejbInterceptorConfig = new EJBInterceptorConfig(this);
     private final ExtensionLoader extensionLoader = new ExtensionLoader(this);
     private final InterceptorsManager interceptorsManager = new InterceptorsManager(this);
     private final WebBeansInterceptorConfig webBeansInterceptorConfig = new WebBeansInterceptorConfig(this);
@@ -291,10 +289,6 @@ public class WebBeansContext
         return webBeansInterceptorConfig;
     }
 
-    public EJBInterceptorConfig getEJBInterceptorConfig()
-    {
-        return ejbInterceptorConfig;
-    }
 
     public StereoTypeManager getStereoTypeManager()
     {

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptorExceptionComponentTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptorExceptionComponentTest.java?rev=1435607&r1=1435606&r2=1435607&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptorExceptionComponentTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptorExceptionComponentTest.java Sat Jan 19 17:15:51 2013
@@ -18,40 +18,24 @@
  */
 package org.apache.webbeans.test.unittests.intercept;
 
-import javax.enterprise.inject.spi.AnnotatedType;
-
 import junit.framework.Assert;
 
-import org.apache.webbeans.component.InjectionTargetBean;
 import org.apache.webbeans.exception.WebBeansConfigurationException;
-import org.apache.webbeans.test.TestContext;
+import org.apache.webbeans.newtests.AbstractUnitTest;
 import org.apache.webbeans.test.component.intercept.MultpleInterceptor;
-import org.junit.Before;
 import org.junit.Test;
 
-public class EJBInterceptorExceptionComponentTest extends TestContext
+public class EJBInterceptorExceptionComponentTest extends AbstractUnitTest
 {
 
-    public EJBInterceptorExceptionComponentTest()
-    {
-        super(EJBInterceptorExceptionComponentTest.class.getName());
-    }
-
-    @Before
-    public void init()
-    {
-        super.init();
-    }
 
     @Test
     public void testComponentTypeException()
     {
         try
         {
-            InjectionTargetBean<MultpleInterceptor> component = defineManagedBean(MultpleInterceptor.class);
+            startContainer(MultpleInterceptor.class);
 
-            AnnotatedType annotatedType = getWebBeansContext().getAnnotatedElementFactory().newAnnotatedType(component.getReturnType());
-            getWebBeansContext().getEJBInterceptorConfig().configure(annotatedType);
         }
         catch (WebBeansConfigurationException e)
         {
@@ -59,6 +43,7 @@ public class EJBInterceptorExceptionComp
             return; // all ok!
         }
         Assert.fail("expecting an exception!");
+        shutDownContainer();
     }
 
 }