[276845] Develop A CDORevisionCache that uses the file system

https://bugs.eclipse.org/bugs/show_bug.cgi?id=276845

5 files changed, 20 insertions, 22 deletions

diff --git a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/cache/DBRevisionCache.java b/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/cache/DBRevisionCache.java
index 3646578282..e153ea6d14 100644
--- a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/cache/DBRevisionCache.java
+++ b/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/cache/DBRevisionCache.java
@@ -21,7 +21,7 @@ import org.eclipse.emf.cdo.common.io.CDODataOutput;
 import org.eclipse.emf.cdo.common.model.CDOPackageRegistry;
 import org.eclipse.emf.cdo.common.revision.CDOListFactory;
 import org.eclipse.emf.cdo.common.revision.CDORevision;
-import org.eclipse.emf.cdo.common.revision.CDORevisionManager;
+import org.eclipse.emf.cdo.common.revision.CDORevisionFactory;
 import org.eclipse.emf.cdo.common.revision.cache.CDORevisionCache;
 import org.eclipse.emf.cdo.internal.common.io.CDODataInputImpl;
 import org.eclipse.emf.cdo.internal.common.io.CDODataOutputImpl;
@@ -63,7 +63,7 @@ public class DBRevisionCache extends Lifecycle implements CDORevisionCache
 
   private CDOPackageRegistry packageRegistry;
 
-  private CDORevisionManager revisionManager;
+  private CDORevisionFactory revisionFactory;
 
   private IDBAdapter dbAdapter;
 
@@ -103,14 +103,14 @@ public class DBRevisionCache extends Lifecycle implements CDORevisionCache
     this.packageRegistry = packageRegistry;
   }
 
-  public CDORevisionManager getRevisionManager()
+  public CDORevisionFactory getRevisionFactory()
   {
-    return revisionManager;
+    return revisionFactory;
   }
 
-  public void setRevisionManager(CDORevisionManager revisionManager)
+  public void setRevisionFactory(CDORevisionFactory revisionFactory)
   {
-    this.revisionManager = revisionManager;
+    this.revisionFactory = revisionFactory;
   }
 
   public IDBAdapter getDBAdapter()
@@ -715,7 +715,7 @@ public class DBRevisionCache extends Lifecycle implements CDORevisionCache
     checkState(idProvider, "idProvider"); //$NON-NLS-1$
     checkState(listFactory, "listFactory");//$NON-NLS-1$
     checkState(packageRegistry, "packageRegistry"); //$NON-NLS-1$
-    checkState(revisionManager, "revisionManager"); //$NON-NLS-1$
+    checkState(revisionFactory, "revisionFactory"); //$NON-NLS-1$
     checkState(dbAdapter, "dbAdapter"); //$NON-NLS-1$
     checkState(dbConnectionProvider, "dbConnectionProvider"); //$NON-NLS-1$
   }
@@ -804,9 +804,9 @@ public class DBRevisionCache extends Lifecycle implements CDORevisionCache
       }
 
       @Override
-      protected CDORevisionManager getRevisionManager()
+      protected CDORevisionFactory getRevisionFactory()
       {
-        return revisionManager;
+        return revisionFactory;
       }
     };
   }
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/io/CDODataInputImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/io/CDODataInputImpl.java
index ad64efd33f..011e7d4452 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/io/CDODataInputImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/io/CDODataInputImpl.java
@@ -33,11 +33,11 @@ import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta;
 import org.eclipse.emf.cdo.internal.common.bundle.OM;
 import org.eclipse.emf.cdo.internal.common.id.CDOIDAndVersionImpl;
 import org.eclipse.emf.cdo.internal.common.id.CDOIDExternalImpl;
-import org.eclipse.emf.cdo.internal.common.id.CDOIDTempObjectExternalImpl;
 import org.eclipse.emf.cdo.internal.common.id.CDOIDMetaImpl;
 import org.eclipse.emf.cdo.internal.common.id.CDOIDMetaRangeImpl;
 import org.eclipse.emf.cdo.internal.common.id.CDOIDObjectLongImpl;
 import org.eclipse.emf.cdo.internal.common.id.CDOIDTempMetaImpl;
+import org.eclipse.emf.cdo.internal.common.id.CDOIDTempObjectExternalImpl;
 import org.eclipse.emf.cdo.internal.common.id.CDOIDTempObjectImpl;
 import org.eclipse.emf.cdo.internal.common.messages.Messages;
 import org.eclipse.emf.cdo.internal.common.revision.delta.CDOAddFeatureDeltaImpl;
@@ -56,7 +56,6 @@ import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageRegistry;
 import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageUnit;
 import org.eclipse.emf.cdo.spi.common.revision.InternalCDOList;
 import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision;
-import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionManager;
 
 import org.eclipse.net4j.util.concurrent.IRWLockManager.LockType;
 import org.eclipse.net4j.util.io.ExtendedDataInput;
@@ -256,8 +255,7 @@ public abstract class CDODataInputImpl extends ExtendedDataInput.Delegating impl
     boolean notNull = readBoolean();
     if (notNull)
     {
-      CDORevisionFactory factory = ((InternalCDORevisionManager)getRevisionFactory()).getFactory();
-      InternalCDORevision revision = (InternalCDORevision)factory.createRevision(null);
+      InternalCDORevision revision = (InternalCDORevision)getRevisionFactory().createRevision(null);
       revision.read(this);
       return revision;
     }
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientIndication.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientIndication.java
index 9aa73f7d28..4755ebb9dc 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientIndication.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientIndication.java
@@ -14,7 +14,7 @@ package org.eclipse.emf.cdo.internal.net4j.protocol;
 import org.eclipse.emf.cdo.common.io.CDODataInput;
 import org.eclipse.emf.cdo.common.model.CDOPackageRegistry;
 import org.eclipse.emf.cdo.common.revision.CDOListFactory;
-import org.eclipse.emf.cdo.common.revision.CDORevisionManager;
+import org.eclipse.emf.cdo.common.revision.CDORevisionFactory;
 import org.eclipse.emf.cdo.internal.common.io.CDODataInputImpl;
 
 import org.eclipse.emf.internal.cdo.revision.CDOListWithElementProxiesImpl;
@@ -72,9 +72,9 @@ public abstract class CDOClientIndication extends Indication
       }
 
       @Override
-      protected CDORevisionManager getRevisionManager()
+      protected CDORevisionFactory getRevisionFactory()
       {
-        return getSession().getRevisionManager();
+        return getSession().getRevisionManager().getFactory();
       }
     });
   }
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientRequest.java
index c4a66bc2a7..15051ba490 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientRequest.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.cdo.common.io.CDODataInput;
 import org.eclipse.emf.cdo.common.io.CDODataOutput;
 import org.eclipse.emf.cdo.common.model.CDOPackageRegistry;
 import org.eclipse.emf.cdo.common.revision.CDOListFactory;
-import org.eclipse.emf.cdo.common.revision.CDORevisionManager;
+import org.eclipse.emf.cdo.common.revision.CDORevisionFactory;
 import org.eclipse.emf.cdo.internal.common.io.CDODataInputImpl;
 import org.eclipse.emf.cdo.internal.common.io.CDODataOutputImpl;
 
@@ -99,9 +99,9 @@ public abstract class CDOClientRequest<RESULT> extends RequestWithConfirmation<R
       }
 
       @Override
-      protected CDORevisionManager getRevisionManager()
+      protected CDORevisionFactory getRevisionFactory()
       {
-        return getSession().getRevisionManager();
+        return getSession().getRevisionManager().getFactory();
       }
     });
   }
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitTransactionRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitTransactionRequest.java
index 23625a58a5..835e7369b6 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitTransactionRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitTransactionRequest.java
@@ -27,7 +27,7 @@ import org.eclipse.emf.cdo.common.model.CDOPackageUnit;
 import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants;
 import org.eclipse.emf.cdo.common.revision.CDOListFactory;
 import org.eclipse.emf.cdo.common.revision.CDORevision;
-import org.eclipse.emf.cdo.common.revision.CDORevisionManager;
+import org.eclipse.emf.cdo.common.revision.CDORevisionFactory;
 import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta;
 import org.eclipse.emf.cdo.eresource.CDOResource;
 import org.eclipse.emf.cdo.internal.common.io.CDODataInputImpl;
@@ -195,9 +195,9 @@ public class CommitTransactionRequest extends RequestWithMonitoring<CommitTransa
       }
 
       @Override
-      protected CDORevisionManager getRevisionManager()
+      protected CDORevisionFactory getRevisionFactory()
       {
-        return getSession().getRevisionManager();
+        return getSession().getRevisionManager().getFactory();
       }
 
       @Override