Fix <Resources> declared via context.xml not imported (https://issues…

….apache.org/jira/browse/TOMEE-263)
oglimmer · May 26, 2019 · 8792113 · 8792113
1 parent 87a9e56
commit 8792113
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java b/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
@@ -70,6 +70,7 @@
 import javax.enterprise.inject.spi.BeanManager;
 import javax.jms.Queue;
 import javax.jms.Topic;
+import javax.naming.Reference;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletRequest;
@@ -1430,7 +1431,9 @@ private void deploy(final AppModule app, final PersistenceModule persistenceModu
                 final ResourceInfo jtaInfo = configFactory.getResourceInfo(potentialName);
                 if (jtaInfo != null) {
                     if (!"false".equalsIgnoreCase(jtaInfo.properties.getProperty("JtaManaged")) // don't test true since it can be missing
-                            && (jtaInfo.types.contains("DataSource") || jtaInfo.types.contains(DataSource.class.getName()))) {
+                            && (jtaInfo.types.contains("DataSource") || jtaInfo.types.contains(DataSource.class.getName())
+                                    || (jtaInfo.properties.get("reference") instanceof Reference // defined in <Context>
+                                            && DataSource.class.getName().equals(((Reference) jtaInfo.properties.get("reference")).getClassName())))) {
                         jtaDataSourceId = jtaInfo.id;
                         break;
                     } else {