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/03/09 18:44:25 UTC
svn commit: r1298944 -
/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
Author: rmannibucau
Date: Fri Mar 9 17:44:25 2012
New Revision: 1298944
URL: http://svn.apache.org/viewvc?rev=1298944&view=rev
Log:
adding default managed runtime for OpenJPA since the one used by OpenJPA doesn't follow our convention
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java?rev=1298944&r1=1298943&r2=1298944&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java Fri Mar 9 17:44:25 2012
@@ -567,6 +567,8 @@ class AppInfoBuilder {
public static final String OPENJPA_RUNTIME_UNENHANCED_CLASSES = "openjpa.RuntimeUnenhancedClasses";
public static final String DEFAULT_RUNTIME_UNENHANCED_CLASSES = "supported";
public static final String REMOVE_DEFAULT_RUNTIME_UNENHANCED_CLASSES = "disable";
+ public static final String OPENJPA_MANAGED_RUNTIME = "openjpa.ManagedRuntime";
+ public static final String DEFAULT_MANAGED_RUNTIME = "jndi(TransactionManagerName=java:comp/TransactionManager)";
public static final String PROVIDER_PROP = "javax.persistence.provider";
public static final String TRANSACTIONTYPE_PROP = "javax.persistence.transactionType";
@@ -673,6 +675,14 @@ class AppInfoBuilder {
+ OPENJPA_RUNTIME_UNENHANCED_CLASSES);
}
+ // default OpenJPA values are not good for us
+ String managedRuntime = info.properties.getProperty(OPENJPA_MANAGED_RUNTIME);
+ if (managedRuntime == null){
+ info.properties.setProperty(OPENJPA_MANAGED_RUNTIME, DEFAULT_MANAGED_RUNTIME);
+ logger.debug("Adjusting PersistenceUnit(name=" + info.name + ") property to "
+ + OPENJPA_MANAGED_RUNTIME + "=" + DEFAULT_MANAGED_RUNTIME);
+ }
+
final Set<String> keys = new HashSet<String>(info.properties.stringPropertyNames());
for (String key : keys) {
if (key.matches("openjpa.Connection(DriverName|URL|UserName|Password)")) {