openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ppod...@apache.org
Subject svn commit: r1161288 - in /openjpa/trunk: openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCPersistenceProductDerivation.java openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java
Date Wed, 24 Aug 2011 21:32:22 GMT
Author: ppoddar
Date: Wed Aug 24 21:32:22 2011
New Revision: 1161288

URL: http://svn.apache.org/viewvc?rev=1161288&view=rev
Log:
Relocate org.apache.openjpa.jdbc.kernel.MixedLockManager configuration to JDBC product derivation

Modified:
    openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCPersistenceProductDerivation.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCPersistenceProductDerivation.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCPersistenceProductDerivation.java?rev=1161288&r1=1161287&r2=1161288&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCPersistenceProductDerivation.java
(original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCPersistenceProductDerivation.java
Wed Aug 24 21:32:22 2011
@@ -91,6 +91,9 @@ public class JDBCPersistenceProductDeriv
             PersistenceMappingDefaults.class.getName());
         conf.mappingDefaultsPlugin.setAlias(jpa.getName(),
             PersistenceMappingDefaults.class.getName());
+        
+        conf.lockManagerPlugin.setAlias("mixed", "org.apache.openjpa.jdbc.kernel.MixedLockManager");
+        
         return true;
     }
 
@@ -105,6 +108,8 @@ public class JDBCPersistenceProductDeriv
         
         conf.mappingDefaultsPlugin.setDefault(jpa.getName());
         conf.mappingDefaultsPlugin.setString(jpa.getName());
+        conf.lockManagerPlugin.setDefault("mixed");
+        conf.lockManagerPlugin.setString("mixed");
         return true;
     } 
     

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java?rev=1161288&r1=1161287&r2=1161288&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java
(original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java
Wed Aug 24 21:32:22 2011
@@ -210,7 +210,6 @@ public class PersistenceProductDerivatio
         conf.writeLockLevel.setAlias("pessimistic-force-increment", String
             .valueOf(MixedLockLevels.LOCK_PESSIMISTIC_FORCE_INCREMENT));
 
-        conf.lockManagerPlugin.setAlias("mixed", "org.apache.openjpa.jdbc.kernel.MixedLockManager");
 
         configureBeanValidation(conf);
         
@@ -279,8 +278,6 @@ public class PersistenceProductDerivatio
         OpenJPAConfigurationImpl conf = (OpenJPAConfigurationImpl) c;
         conf.metaFactoryPlugin.setDefault(SPEC_JPA.getName());
         conf.metaFactoryPlugin.setString(SPEC_JPA.getName());
-        conf.lockManagerPlugin.setDefault("mixed");
-        conf.lockManagerPlugin.setString("mixed");
         conf.nontransactionalWrite.setDefault("true");
         conf.nontransactionalWrite.set(true);
         Specification spec = ((OpenJPAConfiguration) c).getSpecificationInstance();



Mime
View raw message