Author: dblevins
Date: Tue Sep 2 11:42:01 2008
New Revision: 691341
URL: http://svn.apache.org/viewvc?rev=691341&view=rev
Log:
OPENEJB-905: PersistenceUnit property overriding
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.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=691341&r1=691340&r2=691341&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
Tue Sep 2 11:42:01 2008
@@ -495,6 +495,17 @@
}
}
+ Properties overrides =
ConfigurationFactory.getSystemProperties(info.name, "PersistenceUnit");
+ for (Map.Entry<Object, Object> entry : overrides.entrySet()) {
+ Object property = entry.getKey();
+ Object value = entry.getValue();
+ if (info.properties.contains(property)){
+ logger.debug("Overriding persistence-unit "+info.name
+" property " + property + "="+value);
+ } else {
+ logger.debug("Adding persistence-unit "+info.name +"
property " + property + "="+value);
+ }
+ info.properties.put(property, value);
+ }
// The result is that OpenEJB-specific configuration can be
avoided when
// using OpenEJB + Hibernate or another vendor. A second
benefit is that
