You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2017/08/07 11:10:46 UTC
tomee git commit: TOMEE-2110 - DefaultContextService missing like
default resource.
Repository: tomee
Updated Branches:
refs/heads/master 09ee9f96a -> 1fcb7f948
TOMEE-2110 - DefaultContextService missing like default resource.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/1fcb7f94
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/1fcb7f94
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/1fcb7f94
Branch: refs/heads/master
Commit: 1fcb7f9489249b9fb882214d71a5d2dadaa90b3d
Parents: 09ee9f9
Author: Daniel Cunha (soro) <da...@apache.org>
Authored: Sat Aug 5 21:03:42 2017 -0300
Committer: Daniel Cunha (soro) <da...@apache.org>
Committed: Sun Aug 6 09:02:30 2017 -0300
----------------------------------------------------------------------
.../config/BuiltInEnvironmentEntries.java | 2 ++
.../config/BuiltInEnvironmentEntriesTest.java | 28 ++++++++++++++++++++
2 files changed, 30 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/1fcb7f94/container/openejb-core/src/main/java/org/apache/openejb/config/BuiltInEnvironmentEntries.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/BuiltInEnvironmentEntries.java b/container/openejb-core/src/main/java/org/apache/openejb/config/BuiltInEnvironmentEntries.java
index f664544..21c2265 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/BuiltInEnvironmentEntries.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/BuiltInEnvironmentEntries.java
@@ -26,6 +26,7 @@ import org.apache.openejb.jee.JndiConsumer;
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;
@@ -94,6 +95,7 @@ public class BuiltInEnvironmentEntries implements DynamicDeployer {
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");
http://git-wip-us.apache.org/repos/asf/tomee/blob/1fcb7f94/container/openejb-core/src/test/java/org/apache/openejb/config/BuiltInEnvironmentEntriesTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/config/BuiltInEnvironmentEntriesTest.java b/container/openejb-core/src/test/java/org/apache/openejb/config/BuiltInEnvironmentEntriesTest.java
index 16a6bcc..e0a2a7f 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/config/BuiltInEnvironmentEntriesTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/config/BuiltInEnvironmentEntriesTest.java
@@ -29,6 +29,10 @@ import javax.ejb.EJBContext;
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;
@@ -98,6 +102,18 @@ public class BuiltInEnvironmentEntriesTest {
@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();
@@ -139,6 +155,18 @@ public class BuiltInEnvironmentEntriesTest {
@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();