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 2011/10/14 21:54:13 UTC

svn commit: r1183476 - in /openwebbeans/trunk/webbeans-impl/src: main/java/org/apache/webbeans/intercept/ main/java/org/apache/webbeans/util/ test/java/org/apache/webbeans/newtests/interceptors/business/common/ test/java/org/apache/webbeans/newtests/in...

Author: struberg
Date: Fri Oct 14 19:54:13 2011
New Revision: 1183476

URL: http://svn.apache.org/viewvc?rev=1183476&view=rev
Log:
OWB-623 remove AroundInvoke must throw Exception check

According to some EJB EG members, this check is not needed.

Added:
    openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/common/RuntimeExceptionBindingTypeBean.java
      - copied, changed from r1182358, openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/common/WithInheritedBindingTypeBean.java
    openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/ExceptionInterceptorTest.java
      - copied, changed from r1182358, openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/DependingInterceptorTest.java
    openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/common/RuntimeExceptionsInterceptor.java
      - copied, changed from r1182358, openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/common/SecureInterceptor.java
    openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/bindings/RuntimeExceptions.java
      - copied, changed from r1182358, openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/bindings/Secure2.java
    openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/newtests/interceptors/business/tests/RuntimeExceptionsInterceptorTest.xml
      - copied, changed from r1182358, openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/newtests/interceptors/business/tests/DependingInterceptorTest.xml
Removed:
    openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/AroundInvokeWithoutExceptionComponent.java
Modified:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
    openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ExceptionComponentTest.java

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=1183476&r1=1183475&r2=1183476&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 Fri Oct 14 19:54:13 2011
@@ -211,12 +211,9 @@ public final class InterceptorUtil
                     {
                         if (ClassUtil.getReturnType(method).equals(Object.class))
                         {
-                            if (ClassUtil.isMethodHasException(method))
+                            if (!Modifier.isStatic(method.getModifiers()) && !ClassUtil.isFinal(method.getModifiers()))
                             {
-                                if (!Modifier.isStatic(method.getModifiers()) && !ClassUtil.isFinal(method.getModifiers()))
-                                {
-                                    return true;
-                                }
+                                return true;
                             }
                         }
                     }

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java?rev=1183476&r1=1183475&r2=1183476&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java Fri Oct 14 19:54:13 2011
@@ -315,29 +315,6 @@ public final class ClassUtil
     }
 
     /**
-     * Check method throws Exception or not.
-     * 
-     * @param method method instance
-     * @return trur or false
-     */
-    public static boolean isMethodHasException(Method method)
-    {
-        Asserts.nullCheckForMethod(method);
-
-        Class<?>[] et = method.getExceptionTypes();
-
-        if (et.length == 1)
-        {
-            if (et[0].equals(Exception.class))
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
      * Call method on the instance with given arguments.
      * 
      * @param method method instance

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=1183476&r1=1183475&r2=1183476&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 Oct 14 19:54:13 2011
@@ -955,12 +955,6 @@ public final class WebBeansUtil
                             + method.getName() + " in class : " + clazz.getName() + " must return Object type");
                 }
 
-                if (!ClassUtil.isMethodHasException(method))
-                {
-                    throw new WebBeansConfigurationException("@" + annot.getSimpleName() + " annotated method : "
-                            + method.getName() + " in class : " + clazz.getName() + " must throw Exception");
-                }
-
                 if (Modifier.isStatic(method.getModifiers()) || ClassUtil.isFinal(method.getModifiers()))
                 {
                     throw new WebBeansConfigurationException("@" + annot.getSimpleName() + " annotated method : "
@@ -1023,13 +1017,6 @@ public final class WebBeansUtil
                             + " must return Object type");
                 }
 
-                if (!ClassUtil.isMethodHasException(method.getJavaMember()))
-                {
-                    throw new WebBeansConfigurationException("@" + annot.getSimpleName() + " annotated method : "
-                            + method.getJavaMember().getName( )+ " in class : " + annotatedType.getJavaClass().getName()
-                            + " must throw Exception");
-                }
-
                 if (Modifier.isStatic(method.getJavaMember().getModifiers()) ||
                     ClassUtil.isFinal(method.getJavaMember().getModifiers()))
                 {

Copied: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/common/RuntimeExceptionBindingTypeBean.java (from r1182358, openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/common/WithInheritedBindingTypeBean.java)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/common/RuntimeExceptionBindingTypeBean.java?p2=openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/common/RuntimeExceptionBindingTypeBean.java&p1=openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/common/WithInheritedBindingTypeBean.java&r1=1182358&r2=1183476&rev=1183476&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/common/WithInheritedBindingTypeBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/common/RuntimeExceptionBindingTypeBean.java Fri Oct 14 19:54:13 2011
@@ -18,19 +18,18 @@
  */
 package org.apache.webbeans.newtests.interceptors.business.common;
 
+import org.apache.webbeans.test.component.intercept.webbeans.bindings.RuntimeExceptions;
+
 import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
 
-import org.apache.webbeans.test.component.intercept.webbeans.bindings.Secure;
 
-@Named("org.apache.webbeans.newtests.interceptors.business.common.WithInheritedBindingTypeBean")
 @RequestScoped
-@Secure
-public class WithInheritedBindingTypeBean
+public class RuntimeExceptionBindingTypeBean
 {
     
-    public void business()
+    @RuntimeExceptions
+    public int business() throws Exception
     {
-        
+        return 42;
     }
 }

Copied: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/ExceptionInterceptorTest.java (from r1182358, openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/DependingInterceptorTest.java)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/ExceptionInterceptorTest.java?p2=openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/ExceptionInterceptorTest.java&p1=openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/DependingInterceptorTest.java&r1=1182358&r2=1183476&rev=1183476&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/DependingInterceptorTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/ExceptionInterceptorTest.java Fri Oct 14 19:54:13 2011
@@ -18,127 +18,40 @@
  */
 package org.apache.webbeans.newtests.interceptors.business.tests;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Set;
-
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-
-import junit.framework.Assert;
-
-import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.newtests.AbstractUnitTest;
-import org.apache.webbeans.newtests.interceptors.beans.ApplicationScopedBean;
-import org.apache.webbeans.newtests.interceptors.beans.RequestScopedBean;
-import org.apache.webbeans.newtests.interceptors.common.TransactionInterceptor;
+import org.apache.webbeans.newtests.interceptors.business.common.RuntimeExceptionBindingTypeBean;
+import org.apache.webbeans.newtests.interceptors.common.RuntimeExceptionsInterceptor;
 import org.junit.Test;
+import org.junit.Assert;
+
+import java.util.ArrayList;
+import java.util.Collection;
 
 @SuppressWarnings("unchecked")
-public class DependingInterceptorTest extends AbstractUnitTest
+public class ExceptionInterceptorTest extends AbstractUnitTest
 {
-    private static final String PACKAGE_NAME = DependingInterceptorTest.class.getPackage().getName();
+    private static final String PACKAGE_NAME = ExceptionInterceptorTest.class.getPackage().getName();
     
     @Test
-    public void testDependingBeanInterceptor()
+    public void testAroundInvokeWithoutThrowsException() throws Exception
     {
         Collection<String> beanXmls = new ArrayList<String>();
-        beanXmls.add(getXmlPath(PACKAGE_NAME, "DependingInterceptorTest"));
+        beanXmls.add(getXmlPath(PACKAGE_NAME, "RuntimeExceptionsInterceptorTest"));
         
         Collection<Class<?>> beanClasses = new ArrayList<Class<?>>();
-        beanClasses.add(TransactionInterceptor.class);
-        beanClasses.add(ApplicationScopedBean.class);
-        beanClasses.add(RequestScopedBean.class);
-        
-        TransactionInterceptor.count = 0;
-        
-        startContainer(beanClasses, beanXmls);       
-        
-        Set<Bean<?>> beans = getBeanManager().getBeans(RequestScopedBean.class);
-        Assert.assertNotNull(beans);        
-        Bean<RequestScopedBean> bean = (Bean<RequestScopedBean>)beans.iterator().next();                
-        
-        CreationalContext<RequestScopedBean> ctx = getBeanManager().createCreationalContext(bean);
-        
-        Object reference1 = getBeanManager().getReference(bean, RequestScopedBean.class, ctx);
-        Assert.assertNotNull(reference1);
-        
-        Assert.assertTrue(reference1 instanceof RequestScopedBean);
+        beanClasses.add(RuntimeExceptionsInterceptor.class);
+        beanClasses.add(RuntimeExceptionBindingTypeBean.class);
 
-        RequestScopedBean beanInstance1 = (RequestScopedBean)reference1;
-        
-        TransactionInterceptor.count = 0;
-        
-        beanInstance1.getMyService().getJ();
+        startContainer(beanClasses, beanXmls);
 
-        RequestScopedBean realInstance1 = beanInstance1.getInstance();
-        
-        Assert.assertTrue(TransactionInterceptor.ECHO);
-        Assert.assertEquals(1, TransactionInterceptor.count);
+        RuntimeExceptionBindingTypeBean instance = getInstance(RuntimeExceptionBindingTypeBean.class);
 
-        TransactionInterceptor.ECHO = false;
+        Assert.assertNotNull(instance);
 
-        WebBeansContext webBeansContext = WebBeansContext.getInstance();
-        webBeansContext.getContextFactory().destroyRequestContext(null);
-        webBeansContext.getContextFactory().initRequestContext(null);
-
-        CreationalContext<RequestScopedBean> ctx2 = getBeanManager().createCreationalContext(bean);
-        Object reference2 = getBeanManager().getReference(bean, RequestScopedBean.class, ctx2);
-        Assert.assertNotNull(reference2);
-        
-        Assert.assertTrue(reference2 instanceof RequestScopedBean);
-        
-        RequestScopedBean beanInstance2 = (RequestScopedBean)reference2;
-        beanInstance2.getMyService().getJ();
-        RequestScopedBean realInstance2 = beanInstance2.getInstance();
-
-        Assert.assertTrue(TransactionInterceptor.ECHO);
-
-        Assert.assertEquals(2, TransactionInterceptor.count);
-        
-        Assert.assertNotSame(realInstance1, realInstance2);
-        Assert.assertEquals(realInstance1.getMyService().getJ(), realInstance2.getMyService().getJ());
+        int result = instance.business();
+        Assert.assertEquals(42, result);
         
         shutDownContainer();
         
     }
-    
-    @Test
-    public void testInterceptorCreation() throws Exception 
-    {
-            Collection<String> beanXmls = new ArrayList<String>();
-            beanXmls.add(getXmlPath(PACKAGE_NAME, "DependingInterceptorTest"));
-            
-            Collection<Class<?>> beanClasses = new ArrayList<Class<?>>();
-            beanClasses.add(TransactionInterceptor.class);
-            beanClasses.add(ApplicationScopedBean.class);
-            
-            TransactionInterceptor.count = 0;
-            TransactionInterceptor.interceptorCount = 0;
-            
-            startContainer(beanClasses, beanXmls);
-
-            Set<Bean<?>> beans = getBeanManager().getBeans(ApplicationScopedBean.class);
-            Assert.assertNotNull(beans);        
-            Bean<ApplicationScopedBean> bean = (Bean<ApplicationScopedBean>)beans.iterator().next();                
-            
-            CreationalContext<ApplicationScopedBean> ctx = getBeanManager().createCreationalContext(bean);
-            
-            Object reference1 = getBeanManager().getReference(bean, ApplicationScopedBean.class, ctx);
-            Assert.assertNotNull(reference1);
-            
-            ApplicationScopedBean app = (ApplicationScopedBean) reference1;
-
-            app.getJ();
-            Assert.assertEquals(1, TransactionInterceptor.interceptorCount);
-            Assert.assertEquals(1, TransactionInterceptor.count);
-
-            app.getJ();
-            Assert.assertEquals(1, TransactionInterceptor.interceptorCount);
-            Assert.assertEquals(2, TransactionInterceptor.count);
-
-            app.getJ();
-            Assert.assertEquals(1, TransactionInterceptor.interceptorCount);
-            Assert.assertEquals(3, TransactionInterceptor.count);
-}
 }

Copied: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/common/RuntimeExceptionsInterceptor.java (from r1182358, openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/common/SecureInterceptor.java)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/common/RuntimeExceptionsInterceptor.java?p2=openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/common/RuntimeExceptionsInterceptor.java&p1=openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/common/SecureInterceptor.java&r1=1182358&r2=1183476&rev=1183476&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/common/SecureInterceptor.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/common/RuntimeExceptionsInterceptor.java Fri Oct 14 19:54:13 2011
@@ -18,23 +18,30 @@
  */
 package org.apache.webbeans.newtests.interceptors.common;
 
+import org.apache.webbeans.test.component.intercept.webbeans.bindings.RuntimeExceptions;
+
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.Interceptor;
 import javax.interceptor.InvocationContext;
 
-import org.apache.webbeans.test.component.intercept.webbeans.bindings.Secure;
-
+/**
+ * This test interceptor catches all Exceptions and
+ * returns RuntimeExceptions instead.
+ */
 @Interceptor
-@Secure
-public class SecureInterceptor
+@RuntimeExceptions
+public class RuntimeExceptionsInterceptor
 {
-    public static boolean ECHO = false;
-    
     @AroundInvoke
-    public Object invoke(InvocationContext context) throws Exception
+    public Object invoke(InvocationContext context)
     {
-        ECHO = true;
-        
-        return context.proceed();
+        try
+        {
+            return context.proceed();
+        }
+        catch (Exception e)
+        {
+            throw new RuntimeException(e);
+        }
     }
 }

Copied: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/bindings/RuntimeExceptions.java (from r1182358, openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/bindings/Secure2.java)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/bindings/RuntimeExceptions.java?p2=openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/bindings/RuntimeExceptions.java&p1=openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/bindings/Secure2.java&r1=1182358&r2=1183476&rev=1183476&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/bindings/Secure2.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/webbeans/bindings/RuntimeExceptions.java Fri Oct 14 19:54:13 2011
@@ -18,20 +18,20 @@
  */
 package org.apache.webbeans.test.component.intercept.webbeans.bindings;
 
+import javax.interceptor.InterceptorBinding;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.enterprise.util.Nonbinding;
-import javax.interceptor.InterceptorBinding;
-
+/**
+ * This test interceptor catches all Exceptions and
+ * returns RuntimeExceptions instead.
+ */
 @InterceptorBinding
 @Retention(RetentionPolicy.RUNTIME)
 @Target( { ElementType.TYPE, ElementType.METHOD })
-public @interface Secure2 {
-
-    @Nonbinding
-    String[] rolesAllowed() default {};
+public @interface RuntimeExceptions
+{
 
 }

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ExceptionComponentTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ExceptionComponentTest.java?rev=1183476&r1=1183475&r2=1183476&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ExceptionComponentTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ExceptionComponentTest.java Fri Oct 14 19:54:13 2011
@@ -30,7 +30,6 @@ import org.apache.webbeans.test.componen
 import org.apache.webbeans.test.component.exception.AroundInvokeWithSameMethodNameComponent;
 import org.apache.webbeans.test.component.exception.AroundInvokeWithStaticMethodComponent;
 import org.apache.webbeans.test.component.exception.AroundInvokeWithWrongReturnTypeComponent;
-import org.apache.webbeans.test.component.exception.AroundInvokeWithoutExceptionComponent;
 import org.apache.webbeans.test.component.exception.AroundInvokeWithoutParameterComponent;
 import org.apache.webbeans.test.component.exception.AroundInvokeWithoutReturnTypeComponent;
 import org.apache.webbeans.test.component.exception.FinalComponent;
@@ -367,23 +366,6 @@ public class ExceptionComponentTest exte
     }
 
     @Test
-    public void testAroundInvokeWithoutException()
-    {
-        try
-        {
-            clear();
-            AbstractInjectionTargetBean<?> component = defineManagedBean(AroundInvokeWithoutExceptionComponent.class);
-            getWebBeansContext().getEJBInterceptorConfig().configure(component.getReturnType(), component.getInterceptorStack());
-        }
-        catch (WebBeansConfigurationException e)
-        {
-            System.out.println("got expected exception: " + e.getMessage());
-            return; // all ok!
-        }
-        Assert.fail("expecting an exception!");
-    }
-
-    @Test
     public void testAroundInvokeWithStatic()
     {
         try

Copied: openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/newtests/interceptors/business/tests/RuntimeExceptionsInterceptorTest.xml (from r1182358, openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/newtests/interceptors/business/tests/DependingInterceptorTest.xml)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/newtests/interceptors/business/tests/RuntimeExceptionsInterceptorTest.xml?p2=openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/newtests/interceptors/business/tests/RuntimeExceptionsInterceptorTest.xml&p1=openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/newtests/interceptors/business/tests/DependingInterceptorTest.xml&r1=1182358&r2=1183476&rev=1183476&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/newtests/interceptors/business/tests/DependingInterceptorTest.xml (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/newtests/interceptors/business/tests/RuntimeExceptionsInterceptorTest.xml Fri Oct 14 19:54:13 2011
@@ -18,9 +18,7 @@ specific language governing permissions 
 under the License.
 -->
 <beans>
-   <interceptors>
-            <class>org.apache.webbeans.newtests.interceptors.common.TransactionInterceptor</class>
-      <class>org.apache.webbeans.newtests.interceptors.common.SecureInterceptor</class>
-
-   </interceptors>
+    <interceptors>
+        <class>org.apache.webbeans.newtests.interceptors.common.RuntimeExceptionsInterceptor</class>
+    </interceptors>
 </beans>