[jira] [Resolved] (TOMEE-750) @Context in cdi interceptors
[ https://issues.apache.org/jira/browse/TOMEE-750?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Romain Manni-Bucau resolved TOMEE-750. -- Resolution: Fixed @Context in cdi interceptors Key: TOMEE-750 URL: https://issues.apache.org/jira/browse/TOMEE-750 Project: TomEE Issue Type: Bug Reporter: Romain Manni-Bucau Assignee: Romain Manni-Bucau Fix For: 1.5.2 -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira
svn commit: r1438062 - in /tomee/tomee/trunk: container/openejb-core/src/main/java/org/apache/openejb/config/ container/openejb-core/src/main/java/org/apache/openejb/testing/ server/openejb-cxf-rs/src
Author: rmannibucau
Date: Thu Jan 24 16:26:57 2013
New Revision: 1438062
URL: http://svn.apache.org/viewvc?rev=1438062view=rev
Log:
TOMEE-749 TOMEE-750 @Context for cdi interceptors + basic cdi config in
@Classes for tests
Added:
tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CdiInterceptorContextTest.java
- copied, changed from r1436554,
tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimplePojoTest.java
Removed:
tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/ContextReferenceTypes.java
tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RestDeploymentTest.java
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/testing/Classes.java
tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/AutoJAXRSInvoker.java
tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/Contexts.java
tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBEJBInvoker.java
tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBPerRequestPojoResourceProvider.java
tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/ApplicationFromWebXmlTest.java
tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CDIApplicationTest.java
tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JAXRSRoutingTest.java
tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JAXRSWithInterfaceTest.java
tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationTest.java
tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimplePojoTest.java
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java?rev=1438062r1=1438061r2=1438062view=diff
==
---
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java
Thu Jan 24 16:26:57 2013
@@ -259,6 +259,10 @@ public class TldScanner {
// this method clean the cacheByhash too
public static void forceCompleteClean(final ClassLoader loader) {
+if (loader == null) {
+return;
+}
+
quickClean(loader);
cacheByhashCode.remove(hash(urls(loader)));
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java?rev=1438062r1=1438061r2=1438062view=diff
==
---
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
Thu Jan 24 16:26:57 2013
@@ -316,10 +316,17 @@ public final class ApplicationComposers
final org.apache.openejb.junit.Classes classesAnnotationOld =
method.getAnnotation(org.apache.openejb.junit.Classes.class);
Class?[] classes = null;
+Class?[] cdiInterceptors = null;
+Class?[] cdiAlternatives = null;
+Class?[] cdiDecorators = null;
boolean cdi = false;
if (classesAnnotation != null) {
classes = classesAnnotation.value();
-cdi = classesAnnotation.cdi();
+cdiInterceptors = classesAnnotation.cdiInterceptors();
+cdiDecorators = classesAnnotation.cdiDecorators();
+cdiAlternatives = classesAnnotation.cdiAlternatives();
+cdi = classesAnnotation.cdi() || cdiAlternatives.length 0
+|| cdiDecorators.length 0 || cdiInterceptors.length
0;
} else if (classesAnnotationOld != null) {
classes = classesAnnotationOld.value();
}
@@ -343,7
svn commit: r1438163 - /tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBEJBInvoker.java
Author: rmannibucau
Date: Thu Jan 24 20:29:54 2013
New Revision: 1438163
URL: http://svn.apache.org/viewvc?rev=1438163view=rev
Log:
TOMEE-750 @Context for cdi interceptors when added on ejb
Modified:
tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBEJBInvoker.java
Modified:
tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBEJBInvoker.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBEJBInvoker.java?rev=1438163r1=1438162r2=1438163view=diff
==
---
tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBEJBInvoker.java
(original)
+++
tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBEJBInvoker.java
Thu Jan 24 20:29:54 2013
@@ -20,9 +20,10 @@ import org.apache.cxf.jaxrs.JAXRSInvoker
import org.apache.cxf.message.Exchange;
import org.apache.openejb.BeanContext;
import org.apache.openejb.InvalidateReferenceException;
+import org.apache.openejb.cdi.CdiInterceptor;
import org.apache.openejb.core.interceptor.InterceptorData;
+import org.apache.openejb.monitoring.StatsInterceptor;
import org.apache.openejb.rest.ThreadLocalContextManager;
-import org.apache.openejb.server.rest.EJBRestServiceInfo;
import org.apache.openejb.util.proxy.BeanContextInvocationHandler;
import org.apache.openejb.util.proxy.LocalBeanProxyFactory;
import org.apache.openejb.util.proxy.ProxyManager;
@@ -31,6 +32,7 @@ import java.lang.reflect.InvocationHandl
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.rmi.RemoteException;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@@ -44,11 +46,17 @@ public class OpenEJBEJBInvoker extends J
for (BeanContext context : restEjbs) {
final CollectionClass? classes = new HashSetClass?();
Contexts.findContextFields(context.getBeanClass(), classes);
-for (InterceptorData id : context.getInterceptorData()) {
-Contexts.findContextFields(id.getInterceptorClass(), classes);
-}
-for (InterceptorData id : context.getCallbackInterceptors()) {
-Contexts.findContextFields(id.getInterceptorClass(), classes);
+for (CollectionInterceptorData list :
+Arrays.asList(
+context.getInterceptorData(),
+context.getInstanceScopedInterceptors(),
+context.getCallbackInterceptors())) {
+for (InterceptorData id : list) {
+final Class? interceptorClass = id.getInterceptorClass();
+if (!StatsInterceptor.class.equals(interceptorClass)
!CdiInterceptor.class.equals(interceptorClass)) {
+Contexts.findContextFields(interceptorClass, classes);
+}
+}
}
contextTypes.put(context.getBeanClass(), classes);
}
svn commit: r1438281 - in /tomee/tomee/trunk: container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/MultiThreadedManagedDataSourceTest.java tomee/tomee-catalina/src/main/java/org/apach
Author: rmannibucau
Date: Fri Jan 25 00:46:22 2013
New Revision: 1438281
URL: http://svn.apache.org/viewvc?rev=1438281view=rev
Log:
using diff instead of absolute values for test
Modified:
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/MultiThreadedManagedDataSourceTest.java
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/Warmup.java
Modified:
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/MultiThreadedManagedDataSourceTest.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/MultiThreadedManagedDataSourceTest.java?rev=1438281r1=1438280r2=1438281view=diff
==
---
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/MultiThreadedManagedDataSourceTest.java
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/MultiThreadedManagedDataSourceTest.java
Fri Jan 25 00:46:22 2013
@@ -125,6 +125,7 @@ public class MultiThreadedManagedDataSou
@Test
public void inserts() throws SQLException {
+final int start = count();
final AtomicInteger errors = new AtomicInteger(0);
final AtomicInteger fail = new AtomicInteger(0);
run(new Runnable() {
@@ -147,7 +148,7 @@ public class MultiThreadedManagedDataSou
});
assertEquals(0, errors.get());
assertEquals(0, fail.get());
-assertEquals(INSERTS_NB, count());
+assertEquals(INSERTS_NB, count() - start);
}
@Test
Modified:
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/Warmup.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/Warmup.java?rev=1438281r1=1438280r2=1438281view=diff
==
---
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/Warmup.java
(original)
+++
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/Warmup.java
Fri Jan 25 00:46:22 2013
@@ -142,6 +142,7 @@ public class Warmup {
org.apache.tomcat.util.threads.ThreadPoolExecutor,
org.apache.tomee.catalina.BackportUtil,
org.apache.tomee.catalina.BackportUtil$1,
+org.apache.tomee.loader.TomEEJarScanner,
// org.apache.tomee.catalina.TomcatLoader, // can't be
loaded from here
org.apache.webbeans.config.WebBeansFinder,
org.apache.webbeans.container.InjectionResolver,
svn commit: r1438293 - /tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBPerRequestPojoResourceProvider.java
Author: rmannibucau
Date: Fri Jan 25 02:06:43 2013
New Revision: 1438293
URL: http://svn.apache.org/viewvc?rev=1438293view=rev
Log:
if cdi doesn't work for rest use pojo
Modified:
tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBPerRequestPojoResourceProvider.java
Modified:
tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBPerRequestPojoResourceProvider.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBPerRequestPojoResourceProvider.java?rev=1438293r1=1438292r2=1438293view=diff
==
---
tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBPerRequestPojoResourceProvider.java
(original)
+++
tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBPerRequestPojoResourceProvider.java
Fri Jan 25 02:06:43 2013
@@ -82,9 +82,6 @@ public class OpenEJBPerRequestPojoResour
try {
final SetBean? beans = bm.getBeans(clazz);
bean = bm.resolve(beans);
-if (bean == null) {
-throw new NoBeanFoundException(clazz.getName());
-}
} catch (InjectionException ie) {
final String msg = Resource class +
constructor.getDeclaringClass().getName() + can not be instantiated;
throw new
WebApplicationException(Response.serverError().entity(msg).build());
svn commit: r1438303 - /tomee/site/trunk/content/dev/source-code.mdtext
Author: dblevins Date: Fri Jan 25 03:05:07 2013 New Revision: 1438303 URL: http://svn.apache.org/viewvc?rev=1438303view=rev Log: little header cleanup Modified: tomee/site/trunk/content/dev/source-code.mdtext Modified: tomee/site/trunk/content/dev/source-code.mdtext URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/dev/source-code.mdtext?rev=1438303r1=1438302r2=1438303view=diff == --- tomee/site/trunk/content/dev/source-code.mdtext (original) +++ tomee/site/trunk/content/dev/source-code.mdtext Fri Jan 25 03:05:07 2013 @@ -1,14 +1,8 @@ Title: Source Code -a name=SourceCode-Browsing/a -# Browsing - You can browse the source code via the [web interface](http://svn.apache.org/viewvc/tomee/tomee/trunk/) . -a name=SourceCode-Downloading/a -# Downloading - You can download (aka checkout) the sources of Apache TomEE with Subversion client using the following URL [http://svn.apache.org/repos/asf/tomee/tomee/trunk](http://svn.apache.org/repos/asf/tomee/tomee/trunk) .
