svn commit: r1160676 - in /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config: AppInfoBuilder.java JPAPropertyConverter.java

[rmannibucau]

Author: rmannibucau
Date: Tue Aug 23 13:17:04 2011
New Revision: 1160676

URL: http://svn.apache.org/viewvc?rev=1160676&view=rev
Log:
adding some logic in jpa properties convertion

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=1160676&r1=1160675&r2=1160676&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 Aug 23 13:17:04 2011
@@ -633,7 +633,7 @@ class AppInfoBuilder {
                         final Object o = info.properties.remove(key);
                         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));
+                        JPAPropertyConverter.Pair pair = 
JPAPropertyConverter.toOpenJPAValue(key, info.properties.getProperty(key), 
info.properties);
                         if (pair != null && 
!info.properties.containsKey(pair.getKey())) {
                             logger.info("Converting PersistenceUnit(name=" + 
info.name + ") property "
                                     + key + "=" + 
info.properties.getProperty(key) +  " to " + pair.toString());

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=1160676&r1=1160675&r2=1160676&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
 Tue Aug 23 13:17:04 2011
@@ -2,6 +2,8 @@ package org.apache.openejb.config;
 
 import org.apache.openejb.loader.SystemInstance;
 
+import java.util.Properties;
+
 /**
  * @author rmannibucau
  */
@@ -33,12 +35,12 @@ public final class JPAPropertyConverter 
     }
 
     // TODO: manage more properties
-    public static Pair toOpenJPAValue(String key, String value) {
+    public static Pair toOpenJPAValue(String key, String value, Properties 
properties) {
         if 
(!Boolean.parseBoolean(SystemInstance.get().getProperty("openejb.convert-jpa-properties",
 "false"))) {
             return null;
         }
 
-        if (key.startsWith("eclipselink.ddl-generation")) {
+        if (key.startsWith("eclipselink.ddl-generation") && 
!properties.containsKey("openjpa.jdbc.SchemaFactory")) {
             if ("create-tables".equals(value)) {
                 return new Pair("openjpa.jdbc.SynchronizeMappings", 
"buildSchema(ForeignKeys=true)");
             } else if ("drop-and-create-tables".equals("value")) {