Skip to content

TOMEE-2110 - DefaultContextService missing like default resource. #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asfgit merged 1 commit into from
Aug 7, 2017
Merged

TOMEE-2110 - DefaultContextService missing like default resource. #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ...ainer/openejb-core/src/main/java/org/apache/openejb/config/BuiltInEnvironmentEntries.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import org.apache.openejb.jee.JndiReference;
import org.apache.openejb.jee.ResourceEnvRef;

import javax.enterprise.concurrent.ContextService;
import javax.enterprise.concurrent.ManagedExecutorService;
import javax.enterprise.concurrent.ManagedScheduledExecutorService;
import javax.enterprise.concurrent.ManagedThreadFactory;
Expand Down Expand Up @@ -94,6 +95,7 @@ private void add(final JndiConsumer jndi, final DeploymentModule module, final D
add(jndi.getResourceEnvRefMap(), new ResourceEnvRef().name("java:comp/DefaultManagedExecutorService").type(ManagedExecutorService.class));
add(jndi.getResourceEnvRefMap(), new ResourceEnvRef().name("java:comp/DefaultManagedScheduledExecutorService").type(ManagedScheduledExecutorService.class));
add(jndi.getResourceEnvRefMap(), new ResourceEnvRef().name("java:comp/DefaultManagedThreadFactory").type(ManagedThreadFactory.class));
add(jndi.getResourceEnvRefMap(), new ResourceEnvRef().name("java:comp/DefaultContextService").type(ContextService.class));
try {
final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
contextClassLoader.loadClass("org.apache.activemq.ActiveMQSslConnectionFactory");
Expand Down
28 changes: 28 additions & 0 deletions ...r/openejb-core/src/test/java/org/apache/openejb/config/BuiltInEnvironmentEntriesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@
import javax.ejb.Singleton;
import javax.ejb.TransactionManagement;
import javax.ejb.TransactionManagementType;
import javax.enterprise.concurrent.ContextService;
import javax.enterprise.concurrent.ManagedExecutorService;
import javax.enterprise.concurrent.ManagedScheduledExecutorService;
import javax.enterprise.concurrent.ManagedThreadFactory;
import javax.enterprise.inject.spi.BeanManager;
import javax.transaction.TransactionManager;
import javax.transaction.TransactionSynchronizationRegistry;
Expand Down Expand Up @@ -98,6 +102,18 @@ public static class Blue {
@Resource(name = "java:comp/ComponentName")
private String component;

@Resource(name = "java:comp/DefaultContextService")
private ContextService contextService;

@Resource(name = "java:comp/DefaultManagedThreadFactory")
private ManagedThreadFactory managedThreadFactory;

@Resource(name = "java:comp/DefaultManagedScheduledExecutorService")
private ManagedScheduledExecutorService managedScheduledExecutorService;

@Resource(name = "java:comp/DefaultManagedExecutorService")
private ManagedExecutorService managedExecutorService;

public void test() throws Exception {

final Field[] fields = this.getClass().getDeclaredFields();
Expand Down Expand Up @@ -139,6 +155,18 @@ public static class Red {
@Resource
private BeanManager beanManager;

@Resource
private ContextService contextService;

@Resource
private ManagedThreadFactory managedThreadFactory;

@Resource
private ManagedScheduledExecutorService managedScheduledExecutorService;

@Resource
private ManagedExecutorService managedExecutorService;

public void test() throws Exception {

final Field[] fields = this.getClass().getDeclaredFields();
Expand Down