You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2010/11/01 03:05:14 UTC
svn commit: r1029528 - in
/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb:
assembler/classic/PersistenceBuilder.java config/AppInfoBuilder.java
Author: dblevins
Date: Mon Nov 1 02:05:13 2010
New Revision: 1029528
URL: http://svn.apache.org/viewvc?rev=1029528&view=rev
Log:
OPENEJB-1391: Log final persistence unit properties on log4j.category.OpenEJB.startup DEBUG
OPENEJB-1392: Automatically remove 'openjpa.ConnectionDriverName' and related persistence unit properties
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PersistenceBuilder.java
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/assembler/classic/PersistenceBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PersistenceBuilder.java?rev=1029528&r1=1029527&r2=1029528&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PersistenceBuilder.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PersistenceBuilder.java Mon Nov 1 02:05:13 2010
@@ -17,6 +17,7 @@
package org.apache.openejb.assembler.classic;
import java.util.HashMap;
+import java.util.Map;
import javax.persistence.EntityManagerFactory;
import javax.persistence.spi.PersistenceProvider;
import javax.persistence.spi.PersistenceUnitTransactionType;
@@ -191,6 +192,11 @@ public class PersistenceBuilder {
PersistenceProvider persistenceProvider = (PersistenceProvider) clazz.newInstance();
logger.info("assembler.buildingPersistenceUnit", unitInfo.getPersistenceUnitName(), unitInfo.getPersistenceProviderClassName(), unitInfo.getPersistenceUnitRootUrl(), unitInfo.getTransactionType());
+ if (logger.isDebugEnabled()) {
+ for (Map.Entry<Object, Object> entry : unitInfo.getProperties().entrySet()) {
+ logger.debug(entry.getKey() + "=" + entry.getValue());
+ }
+ }
// Create entity manager factory
EntityManagerFactory emf = persistenceProvider.createContainerEntityManagerFactory(unitInfo, new HashMap());
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=1029528&r1=1029527&r2=1029528&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 Nov 1 02:05:13 2010
@@ -70,6 +70,7 @@ import java.io.File;
import java.io.IOException;
import java.net.URL;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
@@ -585,6 +586,14 @@ class AppInfoBuilder {
info.properties.setProperty(property, value);
logger.debug("Adjusting PersistenceUnit(name="+info.name+") property to "+property+"="+value);
}
+
+ final Set<String> keys = new HashSet<String>(info.properties.stringPropertyNames());
+ for (String key : keys) {
+ if (key.matches("openjpa.Connection(DriverName|URL|UserName|Password)")) {
+ info.properties.remove(key);
+ logger.warning("Removing PersistenceUnit(name=" + info.name + ") property " + property + "=" + value + " [not valid in a container environment]");
+ }
+ }
}
}
}