svn commit: r984601 - in /openjpa/trunk: openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheManagerImpl.java openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheBehavesIdentical.java

[curtisr7]

Author: curtisr7
Date: Wed Aug 11 22:00:25 2010
New Revision: 984601

URL: http://svn.apache.org/viewvc?rev=984601&view=rev
Log:
OPENJPA-1763: Auto configure RemoteCommitProvider if it isn't set when the 
DataCache is enabled.

Modified:
    
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheManagerImpl.java
    
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheBehavesIdentical.java

Modified: 
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheManagerImpl.java
URL: 
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheManagerImpl.java?rev=984601&r1=984600&r2=984601&view=diff
==============================================================================
--- 
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheManagerImpl.java
 (original)
+++ 
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCacheManagerImpl.java
 Wed Aug 11 22:00:25 2010
@@ -57,6 +57,17 @@ public class DataCacheManagerImpl
     
     public void initialize(OpenJPAConfiguration conf, ObjectValue dataCache, 
ObjectValue queryCache) {
         _conf = conf;
+        String dc = _conf.getDataCache();
+        String qc = _conf.getQueryCache();
+        // If the DataCache or QueryCache is configured to be anything other 
than false, set the RemoteCommitProvider if
+        // there isn't one.
+        if ((dc != null && dc.contains("false") == false) || (qc != null && 
qc.contains("false") == false)) {
+            String rcp = _conf.getRemoteCommitProvider();
+            if (rcp == null) {
+                _conf.setRemoteCommitProvider("sjvm");
+            }
+        }
+        
         _queryCache = (QueryCache) queryCache.instantiate(QueryCache.class, 
conf);
         if (_queryCache != null)
             _queryCache.initialize(this);

Modified: 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheBehavesIdentical.java
URL: 
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheBehavesIdentical.java?rev=984601&r1=984600&r2=984601&view=diff
==============================================================================
--- 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheBehavesIdentical.java
 (original)
+++ 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheBehavesIdentical.java
 Wed Aug 11 22:00:25 2010
@@ -76,7 +76,6 @@ public class TestDataCacheBehavesIdentic
                     "openjpa.jdbc.SynchronizeMappings",    "buildSchema", 
                     "openjpa.RuntimeUnenhancedClasses",    "unsupported", 
                     "openjpa.DataCache", "true",
-                    "openjpa.RemoteCommitProvider", "sjvm",
                     "openjpa.jdbc.UpdateManager", "constraint",
                     PObject.class,
                     BidirectionalOne2OneOwner.class,