You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/07/27 23:51:57 UTC
svn commit: r1613849 - in
/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb:
cdi/CdiScanner.java config/ConfigurationFactory.java
core/timer/TimerImpl.java core/timer/TimerServiceWrapper.java
Author: rmannibucau
Date: Sun Jul 27 21:51:57 2014
New Revision: 1613849
URL: http://svn.apache.org/r1613849
Log:
mainly style
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerImpl.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerServiceWrapper.java
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java?rev=1613849&r1=1613848&r2=1613849&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java Sun Jul 27 21:51:57 2014
@@ -41,7 +41,6 @@ import org.apache.webbeans.spi.BDABeansX
import org.apache.webbeans.spi.ScannerService;
import java.net.URL;
-import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
@@ -58,7 +57,7 @@ public class CdiScanner implements Scann
private static final Class<?>[] TRANSACTIONAL_INTERCEPTORS = new Class<?>[]{
MandatoryInterceptor.class, NeverInterceptor.class, NotSupportedInterceptor.class,
- RequiredInterceptor.class, RequiredInterceptor.class, SupportsInterceptor.class
+ RequiredInterceptor.class, RequiredNewInterceptor.class, SupportsInterceptor.class
};
// TODO add all annotated class
@@ -85,7 +84,11 @@ public class CdiScanner implements Scann
final DecoratorsManager decoratorsManager = webBeansContext.getDecoratorsManager();
final InterceptorsManager interceptorsManager = webBeansContext.getInterceptorsManager();
+ // "manual" extension to avoid to add it through SPI mecanism
classes.addAll(asList(TRANSACTIONAL_INTERCEPTORS));
+ for (final Class<?> interceptor : TRANSACTIONAL_INTERCEPTORS) {
+ interceptorsManager.addEnabledInterceptorClass(interceptor);
+ }
// app beans
for (final EjbJarInfo ejbJar : appInfo.ejbJars) {
@@ -131,9 +134,6 @@ public class CdiScanner implements Scann
throw new WebBeansConfigurationException("Could not load interceptor class: " + className);
}
}
- for (final Class<?> interceptor : TRANSACTIONAL_INTERCEPTORS) {
- interceptorsManager.addEnabledInterceptorClass(interceptor);
- }
for (final String className : beans.decorators) {
final Class<?> clazz = load(PropertyPlaceHolderHelper.simpleValue(className), classLoader);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java?rev=1613849&r1=1613848&r2=1613849&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java Sun Jul 27 21:51:57 2014
@@ -150,6 +150,7 @@ public class ConfigurationFactory implem
public ConfigurationFactory() {
this(!shouldAutoDeploy());
+ System.setProperty("bval.in-container", "true");
}
private static boolean exists(final String s) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerImpl.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerImpl.java?rev=1613849&r1=1613848&r2=1613849&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerImpl.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerImpl.java Sun Jul 27 21:51:57 2014
@@ -17,11 +17,6 @@
package org.apache.openejb.core.timer;
-import org.apache.openejb.BeanContext;
-import org.apache.openejb.core.BaseContext;
-import org.apache.openejb.core.ThreadContext;
-
-import javax.ejb.EJBContext;
import javax.ejb.EJBException;
import javax.ejb.NoMoreTimeoutsException;
import javax.ejb.NoSuchObjectLocalException;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerServiceWrapper.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerServiceWrapper.java?rev=1613849&r1=1613848&r2=1613849&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerServiceWrapper.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerServiceWrapper.java Sun Jul 27 21:51:57 2014
@@ -22,8 +22,6 @@ import org.apache.openejb.BeanType;
import org.apache.openejb.MethodContext;
import org.apache.openejb.ModuleContext;
import org.apache.openejb.core.ThreadContext;
-import org.apache.openejb.loader.SystemInstance;
-import org.apache.openejb.spi.ContainerSystem;
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
@@ -163,7 +161,7 @@ public class TimerServiceWrapper impleme
return new TimerServiceImpl(timerService, pk, beanContext.getEjbTimeout());
}
- private static class HasSchedule {
+ private static final class HasSchedule {
private final boolean value;
private HasSchedule(final boolean value) {