Author: rmannibucau
Date: Mon Aug 22 05:24:41 2011
New Revision: 1160109
URL: http://svn.apache.org/viewvc?rev=1160109&view=rev
Log:
logging property convertion for PU
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JPAPropertyConverter.java
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java?rev=1160109&r1=1160108&r2=1160109&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
Mon Aug 22 05:24:41 2011
@@ -634,7 +634,9 @@ class AppInfoBuilder {
logger.warning("Removing PersistenceUnit(name=" +
info.name + ") property " + key + "=" + o + " [not valid in a container
environment]");
} else { // try to convert it if necessary
JPAPropertyConverter.Pair pair =
JPAPropertyConverter.toOpenJPAValue(key, info.properties.getProperty(key));
- if (pair != null) {
+ if (pair != null &&
!info.properties.containsKey(pair.getKey())) {
+ logger.info("Converting PersistenceUnit(name=" +
info.name + ") property "
+ + key + "=" +
info.properties.getProperty(key) + " to " + pair.toString());
info.properties.remove(key);
info.properties.setProperty(pair.getKey(),
pair.getValue());
}
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JPAPropertyConverter.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JPAPropertyConverter.java?rev=1160109&r1=1160108&r2=1160109&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JPAPropertyConverter.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JPAPropertyConverter.java
Mon Aug 22 05:24:41 2011
@@ -26,6 +26,10 @@ public final class JPAPropertyConverter
public String getValue() {
return value;
}
+
+ @Override public String toString() {
+ return key + '=' + value;
+ }
}
// TODO: manage more properties
