Author: rmannibucau
Date: Mon May 7 22:06:25 2012
New Revision: 1335281
URL: http://svn.apache.org/viewvc?rev=1335281&view=rev
Log:
TOMEE-171 trying to get @datasourcedefinition datasource before
autolinking/creating a datasource, maybe this part can be enhanced
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java?rev=1335281&r1=1335280&r2=1335281&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
Mon May 7 22:06:25 2012
@@ -1228,6 +1228,21 @@ public class AutoConfig implements Dynam
continue;
}
+ // another try prefixing datasource name with app moduleid, case
of datasourcedefinition for instance
+ final String prefix = app.getModuleId() + "/";
+ required.put("JtaManaged", "true");
+ jtaDataSourceId = findResourceId(prefix + unit.getJtaDataSource(),
"DataSource", required, null);
+
+ required.put("JtaManaged", "false");
+ nonJtaDataSourceId = findResourceId(prefix +
unit.getNonJtaDataSource(), "DataSource", required, null);
+
+ if (jtaDataSourceId != null && nonJtaDataSourceId != null){
+ // Both DataSources were explicitly configured.
+ setJtaDataSource(unit, jtaDataSourceId);
+ setNonJtaDataSource(unit, nonJtaDataSourceId);
+ continue;
+ }
+
//
// If the jta-data-source or the non-jta-data-source link to
// third party resources, then we can't do any auto config
