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 2012/01/04 20:35:36 UTC
svn commit: r1227276 - in
/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb:
assembler/classic/PersistenceBuilder.java config/AutoConfig.java
Author: rmannibucau
Date: Wed Jan 4 19:35:35 2012
New Revision: 1227276
URL: http://svn.apache.org/viewvc?rev=1227276&view=rev
Log:
managing to lookup blueprint datasources when deployed in karaf and avoiding to auto create and replace it
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PersistenceBuilder.java
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/assembler/classic/PersistenceBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PersistenceBuilder.java?rev=1227276&r1=1227275&r2=1227276&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PersistenceBuilder.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PersistenceBuilder.java Wed Jan 4 19:35:35 2012
@@ -86,9 +86,8 @@ public class PersistenceBuilder {
try {
unitInfo.setJtaDataSource((DataSource) new InitialContext().lookup(initialJndiName));
} catch (NamingException ne) {
- // ignored: rethrow the previous one
+ throw new OpenEJBException("Could not lookup <jta-data-source> '" + jtaDataSourceId + "' for unit '" + unitInfo.getPersistenceUnitName() + "'", e);
}
- throw new OpenEJBException("Could not lookup <jta-data-source> '" + jtaDataSourceId + "' for unit '" + unitInfo.getPersistenceUnitName() + "'", e);
}
}
}
@@ -132,9 +131,8 @@ public class PersistenceBuilder {
try {
unitInfo.setNonJtaDataSource((DataSource) new InitialContext().lookup(initialJndiName));
} catch (NamingException ne) {
- // ignored: rethrow the previous one
+ throw new OpenEJBException("Could not lookup <non-jta-data-source> '" + nonJtaDataSourceId + "' for unit '" + unitInfo.getPersistenceUnitName() + "'", e);
}
- throw new OpenEJBException("Could not lookup <non-jta-data-source> '" + nonJtaDataSourceId + "' for unit '" + unitInfo.getPersistenceUnitName() + "'", e);
}
}
}
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=1227276&r1=1227275&r2=1227276&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 Wed Jan 4 19:35:35 2012
@@ -1692,6 +1692,11 @@ public class AutoConfig implements Dynam
for (String id : resourceIds) {
if (id.equalsIgnoreCase(shortName)) return id;
}
+
+ if (resourceId.startsWith("osgi:")) {
+ return resourceId;
+ }
+
return null;
}